diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2013-01-02 19:01:21 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2013-01-02 19:01:21 +0000 |
| commit | b28e481ae9b051dab150e9b5a89730cdc1103a9c (patch) | |
| tree | 434e706ece73a93073f350c91cd35ed7d7e98811 /source/components/disassembler | |
| parent | c2463a8709e5b3a5ce54c09d35b4820a756b0fc5 (diff) | |
Notes
Diffstat (limited to 'source/components/disassembler')
| -rw-r--r-- | source/components/disassembler/dmdeferred.c | 2 | ||||
| -rw-r--r-- | source/components/disassembler/dmnames.c | 6 | ||||
| -rw-r--r-- | source/components/disassembler/dmresrc.c | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/source/components/disassembler/dmdeferred.c b/source/components/disassembler/dmdeferred.c index a3f40aee9b1a..40b4d9e85449 100644 --- a/source/components/disassembler/dmdeferred.c +++ b/source/components/disassembler/dmdeferred.c @@ -83,7 +83,7 @@ AcpiDmParseDeferredOps ( ACPI_STATUS Status; - ACPI_FUNCTION_NAME (DmParseDeferredOps); + ACPI_FUNCTION_ENTRY (); /* Traverse the entire parse tree */ diff --git a/source/components/disassembler/dmnames.c b/source/components/disassembler/dmnames.c index 7284721fd569..35ed7cabe97f 100644 --- a/source/components/disassembler/dmnames.c +++ b/source/components/disassembler/dmnames.c @@ -44,7 +44,6 @@ #include "acpi.h" #include "accommon.h" -#include "acparser.h" #include "amlcode.h" #include "acnamesp.h" #include "acdisasm.h" @@ -226,7 +225,8 @@ AcpiDmNamestring ( /* Handle all Scope Prefix operators */ - while (AcpiPsIsPrefixChar (ACPI_GET8 (Name))) + while (ACPI_IS_ROOT_PREFIX (ACPI_GET8 (Name)) || + ACPI_IS_PARENT_PREFIX (ACPI_GET8 (Name))) { /* Append prefix character */ @@ -323,7 +323,7 @@ AcpiDmDisplayPath ( if ((NamePath) && (NamePath->Common.Value.String) && - (NamePath->Common.Value.String[0] == '\\')) + (ACPI_IS_ROOT_PREFIX (NamePath->Common.Value.String[0]))) { AcpiDmNamestring (NamePath->Common.Value.String); return; diff --git a/source/components/disassembler/dmresrc.c b/source/components/disassembler/dmresrc.c index bf2a4d4da496..89c01fac78df 100644 --- a/source/components/disassembler/dmresrc.c +++ b/source/components/disassembler/dmresrc.c @@ -415,7 +415,8 @@ AcpiDmIsResourceTemplate ( /* Walk the byte list, abort on any invalid descriptor type or length */ - Status = AcpiUtWalkAmlResources (WalkState, Aml, Length, NULL, &EndAml); + Status = AcpiUtWalkAmlResources (WalkState, Aml, Length, + NULL, (void **) &EndAml); if (ACPI_FAILURE (Status)) { return (AE_TYPE); |