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/executer/exresolv.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/executer/exresolv.c')
-rw-r--r-- | sys/contrib/dev/acpica/components/executer/exresolv.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/sys/contrib/dev/acpica/components/executer/exresolv.c b/sys/contrib/dev/acpica/components/executer/exresolv.c index 74a1b73..837ba87 100644 --- a/sys/contrib/dev/acpica/components/executer/exresolv.c +++ b/sys/contrib/dev/acpica/components/executer/exresolv.c @@ -176,7 +176,6 @@ AcpiExResolveObjectToValue ( { case ACPI_REFCLASS_LOCAL: case ACPI_REFCLASS_ARG: - /* * Get the local from the method's state info * Note: this increments the local's object reference count @@ -199,7 +198,6 @@ AcpiExResolveObjectToValue ( *StackPtr = ObjDesc; break; - case ACPI_REFCLASS_INDEX: switch (StackDesc->Reference.TargetType) @@ -209,7 +207,6 @@ AcpiExResolveObjectToValue ( /* Just return - do not dereference */ break; - case ACPI_TYPE_PACKAGE: /* If method call or CopyObject - do not dereference */ @@ -247,7 +244,6 @@ AcpiExResolveObjectToValue ( } break; - default: /* Invalid reference object */ @@ -260,7 +256,6 @@ AcpiExResolveObjectToValue ( } break; - case ACPI_REFCLASS_REFOF: case ACPI_REFCLASS_DEBUG: case ACPI_REFCLASS_TABLE: @@ -300,19 +295,16 @@ AcpiExResolveObjectToValue ( } break; - case ACPI_TYPE_BUFFER: Status = AcpiDsGetBufferArguments (StackDesc); break; - case ACPI_TYPE_PACKAGE: Status = AcpiDsGetPackageArguments (StackDesc); break; - case ACPI_TYPE_BUFFER_FIELD: case ACPI_TYPE_LOCAL_REGION_FIELD: case ACPI_TYPE_LOCAL_BANK_FIELD: @@ -330,6 +322,7 @@ AcpiExResolveObjectToValue ( break; default: + break; } @@ -374,10 +367,12 @@ AcpiExResolveMultiple ( switch (ACPI_GET_DESCRIPTOR_TYPE (ObjDesc)) { case ACPI_DESC_TYPE_OPERAND: + Type = ObjDesc->Common.Type; break; case ACPI_DESC_TYPE_NAMED: + Type = ((ACPI_NAMESPACE_NODE *) ObjDesc)->Type; ObjDesc = AcpiNsGetAttachedObject ((ACPI_NAMESPACE_NODE *) ObjDesc); @@ -454,7 +449,6 @@ AcpiExResolveMultiple ( } break; - case ACPI_REFCLASS_INDEX: /* Get the type of this reference (index into another object) */ @@ -482,13 +476,11 @@ AcpiExResolveMultiple ( } break; - case ACPI_REFCLASS_TABLE: Type = ACPI_TYPE_DDB_HANDLE; goto Exit; - case ACPI_REFCLASS_LOCAL: case ACPI_REFCLASS_ARG: @@ -520,7 +512,6 @@ AcpiExResolveMultiple ( } break; - case ACPI_REFCLASS_DEBUG: /* The Debug Object is of type "DebugObject" */ @@ -528,7 +519,6 @@ AcpiExResolveMultiple ( Type = ACPI_TYPE_DEBUG_OBJECT; goto Exit; - default: ACPI_ERROR ((AE_INFO, @@ -564,7 +554,9 @@ Exit: break; default: + /* No change to Type required */ + break; } |