diff options
| author | jkim <jkim@FreeBSD.org> | 2013-01-02 19:01:21 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2013-01-02 19:01:21 +0000 |
| commit | 8f7c8be022add76a280165a4247448f1fcd77631 (patch) | |
| tree | 434e706ece73a93073f350c91cd35ed7d7e98811 /source/components/parser/psargs.c | |
| parent | 526bfcf905004d9b67338a445cb661a63c3de018 (diff) | |
| download | FreeBSD-src-8f7c8be022add76a280165a4247448f1fcd77631.zip FreeBSD-src-8f7c8be022add76a280165a4247448f1fcd77631.tar.gz | |
Import ACPICA 20121220.
Diffstat (limited to 'source/components/parser/psargs.c')
| -rw-r--r-- | source/components/parser/psargs.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/components/parser/psargs.c b/source/components/parser/psargs.c index 74d0cc8..d4fd1fa 100644 --- a/source/components/parser/psargs.c +++ b/source/components/parser/psargs.c @@ -118,7 +118,7 @@ AcpiPsGetNextPackageLength ( /* Byte 0 is a special case, either bits [0:3] or [0:5] are used */ PackageLength |= (Aml[0] & ByteZeroMask); - return_UINT32 (PackageLength); + return_VALUE (PackageLength); } @@ -182,7 +182,8 @@ AcpiPsGetNextNamestring ( /* Point past any namestring prefix characters (backslash or carat) */ - while (AcpiPsIsPrefixChar (*End)) + while (ACPI_IS_ROOT_PREFIX (*End) || + ACPI_IS_PARENT_PREFIX (*End)) { End++; } @@ -868,7 +869,8 @@ AcpiPsGetNextArg ( Subop = AcpiPsPeekOpcode (ParserState); if (Subop == 0 || AcpiPsIsLeadingChar (Subop) || - AcpiPsIsPrefixChar (Subop)) + ACPI_IS_ROOT_PREFIX (Subop) || + ACPI_IS_PARENT_PREFIX (Subop)) { /* NullName or NameString */ |
