diff options
| author | jkim <jkim@FreeBSD.org> | 2013-05-20 23:52:49 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2013-05-20 23:52:49 +0000 |
| commit | ca7944e4059769f0f5788417db3d8f3b2a8e7996 (patch) | |
| tree | 3858a454e4df3ea62639923664ce32f0d9706e26 /sys/contrib/dev/acpica/components/dispatcher/dswload.c | |
| parent | 4cdc15c1f748d4763888b9351c2316a878059a87 (diff) | |
| parent | af69f95bba3597db53a980597cfd371c9f6ee7cf (diff) | |
| download | FreeBSD-src-ca7944e4059769f0f5788417db3d8f3b2a8e7996.zip FreeBSD-src-ca7944e4059769f0f5788417db3d8f3b2a8e7996.tar.gz | |
Merge ACPICA 20130517.
Diffstat (limited to 'sys/contrib/dev/acpica/components/dispatcher/dswload.c')
| -rw-r--r-- | sys/contrib/dev/acpica/components/dispatcher/dswload.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/contrib/dev/acpica/components/dispatcher/dswload.c b/sys/contrib/dev/acpica/components/dispatcher/dswload.c index f86dea2..1cc8d4f 100644 --- a/sys/contrib/dev/acpica/components/dispatcher/dswload.c +++ b/sys/contrib/dev/acpica/components/dispatcher/dswload.c @@ -81,6 +81,7 @@ AcpiDsInitCallbacks ( switch (PassNumber) { case 1: + WalkState->ParseFlags = ACPI_PARSE_LOAD_PASS1 | ACPI_PARSE_DELETE_TREE; WalkState->DescendingCallback = AcpiDsLoad1BeginOp; @@ -88,6 +89,7 @@ AcpiDsInitCallbacks ( break; case 2: + WalkState->ParseFlags = ACPI_PARSE_LOAD_PASS1 | ACPI_PARSE_DELETE_TREE; WalkState->DescendingCallback = AcpiDsLoad2BeginOp; @@ -95,6 +97,7 @@ AcpiDsInitCallbacks ( break; case 3: + #ifndef ACPI_NO_METHOD_EXECUTION WalkState->ParseFlags |= ACPI_PARSE_EXECUTE | ACPI_PARSE_DELETE_TREE; @@ -104,6 +107,7 @@ AcpiDsInitCallbacks ( break; default: + return (AE_BAD_PARAMETER); } @@ -174,7 +178,6 @@ AcpiDsLoad1BeginOp ( switch (WalkState->Opcode) { case AML_SCOPE_OP: - /* * The target name of the Scope() operator must exist at this point so * that we can actually open the scope to enter new names underneath it. @@ -221,7 +224,6 @@ AcpiDsLoad1BeginOp ( case ACPI_TYPE_INTEGER: case ACPI_TYPE_STRING: case ACPI_TYPE_BUFFER: - /* * These types we will allow, but we will change the type. * This enables some existing code of the form: @@ -242,7 +244,6 @@ AcpiDsLoad1BeginOp ( break; case ACPI_TYPE_METHOD: - /* * Allow scope change to root during execution of module-level * code. Root is typed METHOD during this time. @@ -268,7 +269,6 @@ AcpiDsLoad1BeginOp ( } break; - default: /* * For all other named opcodes, we will enter the name into |
