diff options
Diffstat (limited to 'sys/contrib/dev/acpica/exresop.c')
| -rw-r--r-- | sys/contrib/dev/acpica/exresop.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/sys/contrib/dev/acpica/exresop.c b/sys/contrib/dev/acpica/exresop.c index 8c12470..a383503 100644 --- a/sys/contrib/dev/acpica/exresop.c +++ b/sys/contrib/dev/acpica/exresop.c @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: exresop - AML Interpreter operand/object resolution - * $Revision: 33 $ + * $Revision: 37 $ * *****************************************************************************/ @@ -151,7 +151,8 @@ AcpiExCheckObjectType ( ACPI_OBJECT_TYPE ThisType, void *Object) { - PROC_NAME ("AcpiExCheckObjectType"); + PROC_NAME ("ExCheckObjectType"); + if (TypeNeeded == ACPI_TYPE_ANY) { @@ -204,7 +205,7 @@ AcpiExResolveOperands ( UINT8 ObjectType; void *TempNode; UINT32 ArgTypes; - ACPI_OPCODE_INFO *OpInfo; + const ACPI_OPCODE_INFO *OpInfo; UINT32 ThisArgType; ACPI_OBJECT_TYPE TypeNeeded; @@ -222,7 +223,7 @@ AcpiExResolveOperands ( ArgTypes = OpInfo->RuntimeArgs; if (ArgTypes == ARGI_INVALID_OPCODE) { - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Internal - %X is not a valid AML opcode\n", + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Internal - %X is not a valid AML opcode\n", Opcode)); return_ACPI_STATUS (AE_AML_INTERNAL); @@ -239,12 +240,11 @@ AcpiExResolveOperands ( * to) the required type; if stack underflows; or upon * finding a NULL stack entry (which should not happen). */ - while (GET_CURRENT_ARG_TYPE (ArgTypes)) { if (!StackPtr || !*StackPtr) { - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Internal - null stack entry at %X\n", + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Internal - null stack entry at %X\n", StackPtr)); return_ACPI_STATUS (AE_AML_INTERNAL); @@ -284,7 +284,6 @@ AcpiExResolveOperands ( /* * Decode the Reference */ - OpInfo = AcpiPsGetOpcodeInfo (Opcode); if (ACPI_GET_OP_TYPE (OpInfo) != ACPI_OP_TYPE_OPCODE) { @@ -333,7 +332,6 @@ AcpiExResolveOperands ( /* * Get one argument type, point to the next */ - ThisArgType = GET_CURRENT_ARG_TYPE (ArgTypes); INCREMENT_ARG_LIST (ArgTypes); @@ -342,7 +340,6 @@ AcpiExResolveOperands ( * Handle cases where the object does not need to be * resolved to a value */ - switch (ThisArgType) { @@ -375,7 +372,6 @@ AcpiExResolveOperands ( * Convert an indirect name ptr to direct name ptr and put * it on the stack */ - TempNode = ObjDesc->Reference.Object; AcpiUtRemoveReference (ObjDesc); (*StackPtr) = TempNode; @@ -393,7 +389,6 @@ AcpiExResolveOperands ( * Instead, we just want to store the reference object. * -- All others must be resolved below. */ - if ((Opcode == AML_STORE_OP) && ((*StackPtr)->Common.Type == INTERNAL_TYPE_REFERENCE) && ((*StackPtr)->Reference.Opcode == AML_INDEX_OP)) @@ -407,7 +402,6 @@ AcpiExResolveOperands ( /* * Resolve this object to a value */ - Status = AcpiExResolveToValue (StackPtr, WalkState); if (ACPI_FAILURE (Status)) { @@ -470,7 +464,6 @@ AcpiExResolveOperands ( /* * The more complex cases allow multiple resolved object types */ - case ARGI_INTEGER: /* Number */ /* |
