diff options
Diffstat (limited to 'sys/contrib/dev/acpica/dsmthdat.c')
| -rw-r--r-- | sys/contrib/dev/acpica/dsmthdat.c | 68 |
1 files changed, 33 insertions, 35 deletions
diff --git a/sys/contrib/dev/acpica/dsmthdat.c b/sys/contrib/dev/acpica/dsmthdat.c index da4aac5..10c1a9b 100644 --- a/sys/contrib/dev/acpica/dsmthdat.c +++ b/sys/contrib/dev/acpica/dsmthdat.c @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dsmthdat - control method arguments and local variables - * $Revision: 1.85 $ + * $Revision: 1.92 $ * ******************************************************************************/ @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2005, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2007, Intel Corp. * All rights reserved. * * 2. License @@ -164,7 +164,7 @@ AcpiDsMethodDataGetType ( * special data types. * * NOTES: WalkState fields are initialized to zero by the - * ACPI_MEM_CALLOCATE(). + * ACPI_ALLOCATE_ZEROED(). * * A pseudo-Namespace Node is assigned to each argument and local * so that RefOf() can return a pointer to the Node. @@ -178,34 +178,32 @@ AcpiDsMethodDataInit ( UINT32 i; - ACPI_FUNCTION_TRACE ("DsMethodDataInit"); + ACPI_FUNCTION_TRACE (DsMethodDataInit); /* Init the method arguments */ for (i = 0; i < ACPI_METHOD_NUM_ARGS; i++) { - ACPI_MOVE_32_TO_32 (&WalkState->Arguments[i].Name, - NAMEOF_ARG_NTE); + ACPI_MOVE_32_TO_32 (&WalkState->Arguments[i].Name, NAMEOF_ARG_NTE); WalkState->Arguments[i].Name.Integer |= (i << 24); - WalkState->Arguments[i].Descriptor = ACPI_DESC_TYPE_NAMED; - WalkState->Arguments[i].Type = ACPI_TYPE_ANY; - WalkState->Arguments[i].Flags = ANOBJ_END_OF_PEER_LIST | - ANOBJ_METHOD_ARG; + WalkState->Arguments[i].DescriptorType = ACPI_DESC_TYPE_NAMED; + WalkState->Arguments[i].Type = ACPI_TYPE_ANY; + WalkState->Arguments[i].Flags = + ANOBJ_END_OF_PEER_LIST | ANOBJ_METHOD_ARG; } /* Init the method locals */ for (i = 0; i < ACPI_METHOD_NUM_LOCALS; i++) { - ACPI_MOVE_32_TO_32 (&WalkState->LocalVariables[i].Name, - NAMEOF_LOCAL_NTE); + ACPI_MOVE_32_TO_32 (&WalkState->LocalVariables[i].Name, NAMEOF_LOCAL_NTE); WalkState->LocalVariables[i].Name.Integer |= (i << 24); - WalkState->LocalVariables[i].Descriptor = ACPI_DESC_TYPE_NAMED; - WalkState->LocalVariables[i].Type = ACPI_TYPE_ANY; - WalkState->LocalVariables[i].Flags = ANOBJ_END_OF_PEER_LIST | - ANOBJ_METHOD_LOCAL; + WalkState->LocalVariables[i].DescriptorType = ACPI_DESC_TYPE_NAMED; + WalkState->LocalVariables[i].Type = ACPI_TYPE_ANY; + WalkState->LocalVariables[i].Flags = + ANOBJ_END_OF_PEER_LIST | ANOBJ_METHOD_LOCAL; } return_VOID; @@ -232,7 +230,7 @@ AcpiDsMethodDataDeleteAll ( UINT32 Index; - ACPI_FUNCTION_TRACE ("DsMethodDataDeleteAll"); + ACPI_FUNCTION_TRACE (DsMethodDataDeleteAll); /* Detach the locals */ @@ -295,7 +293,7 @@ AcpiDsMethodDataInitArgs ( UINT32 Index = 0; - ACPI_FUNCTION_TRACE_PTR ("DsMethodDataInitArgs", Params); + ACPI_FUNCTION_TRACE_PTR (DsMethodDataInitArgs, Params); if (!Params) @@ -352,7 +350,7 @@ AcpiDsMethodDataGetNode ( ACPI_WALK_STATE *WalkState, ACPI_NAMESPACE_NODE **Node) { - ACPI_FUNCTION_TRACE ("DsMethodDataGetNode"); + ACPI_FUNCTION_TRACE (DsMethodDataGetNode); /* @@ -364,8 +362,8 @@ AcpiDsMethodDataGetNode ( if (Index > ACPI_METHOD_MAX_LOCAL) { - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, - "Local index %d is invalid (max %d)\n", + ACPI_ERROR ((AE_INFO, + "Local index %d is invalid (max %d)", Index, ACPI_METHOD_MAX_LOCAL)); return_ACPI_STATUS (AE_AML_INVALID_INDEX); } @@ -379,8 +377,8 @@ AcpiDsMethodDataGetNode ( if (Index > ACPI_METHOD_MAX_ARG) { - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, - "Arg index %d is invalid (max %d)\n", + ACPI_ERROR ((AE_INFO, + "Arg index %d is invalid (max %d)", Index, ACPI_METHOD_MAX_ARG)); return_ACPI_STATUS (AE_AML_INVALID_INDEX); } @@ -391,7 +389,7 @@ AcpiDsMethodDataGetNode ( break; default: - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Opcode %d is invalid\n", Opcode)); + ACPI_ERROR ((AE_INFO, "Opcode %d is invalid", Opcode)); return_ACPI_STATUS (AE_AML_BAD_OPCODE); } @@ -426,7 +424,7 @@ AcpiDsMethodDataSetValue ( ACPI_NAMESPACE_NODE *Node; - ACPI_FUNCTION_TRACE ("DsMethodDataSetValue"); + ACPI_FUNCTION_TRACE (DsMethodDataSetValue); ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, @@ -485,14 +483,14 @@ AcpiDsMethodDataGetValue ( ACPI_OPERAND_OBJECT *Object; - ACPI_FUNCTION_TRACE ("DsMethodDataGetValue"); + ACPI_FUNCTION_TRACE (DsMethodDataGetValue); /* Validate the object descriptor */ if (!DestDesc) { - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Null object descriptor pointer\n")); + ACPI_ERROR ((AE_INFO, "Null object descriptor pointer")); return_ACPI_STATUS (AE_BAD_PARAMETER); } @@ -540,22 +538,22 @@ AcpiDsMethodDataGetValue ( { case AML_ARG_OP: - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, - "Uninitialized Arg[%d] at node %p\n", + ACPI_ERROR ((AE_INFO, + "Uninitialized Arg[%d] at node %p", Index, Node)); return_ACPI_STATUS (AE_AML_UNINITIALIZED_ARG); case AML_LOCAL_OP: - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, - "Uninitialized Local[%d] at node %p\n", + ACPI_ERROR ((AE_INFO, + "Uninitialized Local[%d] at node %p", Index, Node)); return_ACPI_STATUS (AE_AML_UNINITIALIZED_LOCAL); default: - ACPI_REPORT_ERROR (("Not Arg/Local opcode: %X\n", Opcode)); + ACPI_ERROR ((AE_INFO, "Not a Arg/Local opcode: %X", Opcode)); return_ACPI_STATUS (AE_AML_INTERNAL); } } @@ -597,7 +595,7 @@ AcpiDsMethodDataDeleteValue ( ACPI_OPERAND_OBJECT *Object; - ACPI_FUNCTION_TRACE ("DsMethodDataDeleteValue"); + ACPI_FUNCTION_TRACE (DsMethodDataDeleteValue); /* Get the namespace node for the arg/local */ @@ -664,7 +662,7 @@ AcpiDsStoreObjectToLocal ( ACPI_OPERAND_OBJECT *NewObjDesc; - ACPI_FUNCTION_TRACE ("DsStoreObjectToLocal"); + ACPI_FUNCTION_TRACE (DsStoreObjectToLocal); ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Opcode=%X Index=%d Obj=%p\n", Opcode, Index, ObjDesc)); @@ -816,7 +814,7 @@ AcpiDsMethodDataGetType ( ACPI_OPERAND_OBJECT *Object; - ACPI_FUNCTION_TRACE ("DsMethodDataGetType"); + ACPI_FUNCTION_TRACE (DsMethodDataGetType); /* Get the namespace node for the arg/local */ |
