diff options
| author | jkim <jkim@FreeBSD.org> | 2013-01-17 23:56:43 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2013-01-17 23:56:43 +0000 |
| commit | 2a54ee62b3fb5d0e9bf39d81edd2cc14a56166a4 (patch) | |
| tree | a7cdf321edb5a438878660c0df9e9bf8a70038e1 /sys/contrib/dev/acpica/components/disassembler/dmnames.c | |
| parent | 39b667a9d0968b8b54185d03b5b8bb2670346424 (diff) | |
| parent | 8f7c8be022add76a280165a4247448f1fcd77631 (diff) | |
| download | FreeBSD-src-2a54ee62b3fb5d0e9bf39d81edd2cc14a56166a4.zip FreeBSD-src-2a54ee62b3fb5d0e9bf39d81edd2cc14a56166a4.tar.gz | |
Merge ACPICA 20130117.
Diffstat (limited to 'sys/contrib/dev/acpica/components/disassembler/dmnames.c')
| -rw-r--r-- | sys/contrib/dev/acpica/components/disassembler/dmnames.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/contrib/dev/acpica/components/disassembler/dmnames.c b/sys/contrib/dev/acpica/components/disassembler/dmnames.c index 0149bff..b2ef29d 100644 --- a/sys/contrib/dev/acpica/components/disassembler/dmnames.c +++ b/sys/contrib/dev/acpica/components/disassembler/dmnames.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2012, Intel Corp. + * Copyright (C) 2000 - 2013, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -44,7 +44,6 @@ #include <contrib/dev/acpica/include/acpi.h> #include <contrib/dev/acpica/include/accommon.h> -#include <contrib/dev/acpica/include/acparser.h> #include <contrib/dev/acpica/include/amlcode.h> #include <contrib/dev/acpica/include/acnamesp.h> #include <contrib/dev/acpica/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; |
