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/compiler/aslopt.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/compiler/aslopt.c')
| -rw-r--r-- | sys/contrib/dev/acpica/compiler/aslopt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/contrib/dev/acpica/compiler/aslopt.c b/sys/contrib/dev/acpica/compiler/aslopt.c index 244e46c..3471006 100644 --- a/sys/contrib/dev/acpica/compiler/aslopt.c +++ b/sys/contrib/dev/acpica/compiler/aslopt.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 @@ -305,7 +305,7 @@ OptBuildShortestPath ( for (i = 0; i < NumCarats; i++) { - NewPathExternal[i] = '^'; + NewPathExternal[i] = AML_PARENT_PREFIX; } /* @@ -329,7 +329,7 @@ OptBuildShortestPath ( if (Op->Asl.AmlOpcode == AML_SCOPE_OP) { - NewPathExternal[i] = '^'; + NewPathExternal[i] = AML_PARENT_PREFIX; i++; ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OPTIMIZATIONS, "(EXTRA ^)")); } @@ -448,7 +448,7 @@ OptOptimizeNameDeclaration ( if (((CurrentNode == AcpiGbl_RootNode) || (Op->Common.Parent->Asl.ParseOpcode == PARSEOP_DEFINITIONBLOCK)) && - (AmlNameString[0] == '\\')) + (ACPI_IS_ROOT_PREFIX (AmlNameString[0]))) { /* * The current scope is the root, and the namepath has a root prefix |
