Vendor import of the Intel ACPI CA 20020217 drop.

1 files changed, 26 insertions, 29 deletions

diff --git a/sys/contrib/dev/acpica/dsmthdat.c b/sys/contrib/dev/acpica/dsmthdat.c
index e597976..3f8d3c2 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: 53 $
+ *              $Revision: 58 $
  *
  ******************************************************************************/
 
@@ -9,7 +9,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999, 2000, 2001, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -125,7 +125,7 @@
 
 
 #define _COMPONENT          ACPI_DISPATCHER
-        MODULE_NAME         ("dsmthdat")
+        ACPI_MODULE_NAME    ("dsmthdat")
 
 
 /*******************************************************************************
@@ -156,32 +156,32 @@ AcpiDsMethodDataInit (
     UINT32                  i;
 
 
-    FUNCTION_TRACE ("DsMethodDataInit");
+    ACPI_FUNCTION_TRACE ("DsMethodDataInit");
 
 
     /* Init the method arguments */
 
     for (i = 0; i < MTH_NUM_ARGS; i++)
     {
-        MOVE_UNALIGNED32_TO_32 (&WalkState->Arguments[i].Name,
+        ACPI_MOVE_UNALIGNED32_TO_32 (&WalkState->Arguments[i].Name,
                                 NAMEOF_ARG_NTE);
-        WalkState->Arguments[i].Name       |= (i << 24);
-        WalkState->Arguments[i].DataType    = 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].Name      |= (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;
     }
 
     /* Init the method locals */
 
     for (i = 0; i < MTH_NUM_LOCALS; i++)
     {
-        MOVE_UNALIGNED32_TO_32 (&WalkState->LocalVariables[i].Name,
+        ACPI_MOVE_UNALIGNED32_TO_32 (&WalkState->LocalVariables[i].Name,
                                 NAMEOF_LOCAL_NTE);
 
-        WalkState->LocalVariables[i].Name    |= (i << 24);
-        WalkState->LocalVariables[i].DataType = 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].Name      |= (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;
     }
 
     return_ACPI_STATUS (AE_OK);
@@ -208,7 +208,7 @@ AcpiDsMethodDataDeleteAll (
     UINT32                  Index;
 
 
-    FUNCTION_TRACE ("DsMethodDataDeleteAll");
+    ACPI_FUNCTION_TRACE ("DsMethodDataDeleteAll");
 
 
     /* Detach the locals */
@@ -271,7 +271,7 @@ AcpiDsMethodDataInitArgs (
     UINT32                  Index = 0;
 
 
-    FUNCTION_TRACE_PTR ("DsMethodDataInitArgs", Params);
+    ACPI_FUNCTION_TRACE_PTR ("DsMethodDataInitArgs", Params);
 
 
     if (!Params)
@@ -323,7 +323,7 @@ AcpiDsMethodDataGetNode (
     ACPI_WALK_STATE         *WalkState,
     ACPI_NAMESPACE_NODE     **Node)
 {
-    FUNCTION_TRACE ("DsMethodDataGetNode");
+    ACPI_FUNCTION_TRACE ("DsMethodDataGetNode");
 
 
     /*
@@ -362,7 +362,6 @@ AcpiDsMethodDataGetNode (
     default:
         ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Opcode %d is invalid\n", Opcode));
         return_ACPI_STATUS (AE_AML_BAD_OPCODE);
-        break;
     }
 
     return_ACPI_STATUS (AE_OK);
@@ -395,7 +394,7 @@ AcpiDsMethodDataSetValue (
     ACPI_NAMESPACE_NODE     *Node;
 
 
-    FUNCTION_TRACE ("DsMethodDataSetValue");
+    ACPI_FUNCTION_TRACE ("DsMethodDataSetValue");
 
 
     /* Get the namespace node for the arg/local */
@@ -430,7 +429,7 @@ AcpiDsMethodDataSetValue (
  *
  ******************************************************************************/
 
-ACPI_OBJECT_TYPE8
+ACPI_OBJECT_TYPE
 AcpiDsMethodDataGetType (
     UINT16                  Opcode,
     UINT32                  Index,
@@ -441,7 +440,7 @@ AcpiDsMethodDataGetType (
     ACPI_OPERAND_OBJECT     *Object;
 
 
-    FUNCTION_TRACE ("DsMethodDataGetType");
+    ACPI_FUNCTION_TRACE ("DsMethodDataGetType");
 
 
     /* Get the namespace node for the arg/local */
@@ -498,7 +497,7 @@ AcpiDsMethodDataGetValue (
     ACPI_OPERAND_OBJECT     *Object;
 
 
-    FUNCTION_TRACE ("DsMethodDataGetValue");
+    ACPI_FUNCTION_TRACE ("DsMethodDataGetValue");
 
 
     /* Validate the object descriptor */
@@ -540,7 +539,6 @@ AcpiDsMethodDataGetValue (
                 Index, Node));
 
             return_ACPI_STATUS (AE_AML_UNINITIALIZED_ARG);
-            break;
 
         case AML_LOCAL_OP:
 
@@ -548,7 +546,6 @@ AcpiDsMethodDataGetValue (
                 Index, Node));
 
             return_ACPI_STATUS (AE_AML_UNINITIALIZED_LOCAL);
-            break;
         }
     }
 
@@ -589,7 +586,7 @@ AcpiDsMethodDataDeleteValue (
     ACPI_OPERAND_OBJECT     *Object;
 
 
-    FUNCTION_TRACE ("DsMethodDataDeleteValue");
+    ACPI_FUNCTION_TRACE ("DsMethodDataDeleteValue");
 
 
     /* Get the namespace node for the arg/local */
@@ -612,7 +609,7 @@ AcpiDsMethodDataDeleteValue (
     Node->Object = NULL;
 
     if ((Object) &&
-        (VALID_DESCRIPTOR_TYPE (Object, ACPI_DESC_TYPE_INTERNAL)))
+        (ACPI_GET_DESCRIPTOR_TYPE (Object) == ACPI_DESC_TYPE_INTERNAL))
     {
         /*
          * There is a valid object.
@@ -655,7 +652,7 @@ AcpiDsStoreObjectToLocal (
     ACPI_OPERAND_OBJECT     *CurrentObjDesc;
 
 
-    FUNCTION_TRACE ("DsStoreObjectToLocal");
+    ACPI_FUNCTION_TRACE ("DsStoreObjectToLocal");
     ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Opcode=%d Idx=%d Obj=%p\n",
         Opcode, Index, ObjDesc));
 
@@ -707,7 +704,7 @@ AcpiDsStoreObjectToLocal (
          * Weird, but true.
          */
         if ((Opcode == AML_ARG_OP) &&
-            (VALID_DESCRIPTOR_TYPE (CurrentObjDesc, ACPI_DESC_TYPE_NAMED)))
+            (ACPI_GET_DESCRIPTOR_TYPE (CurrentObjDesc) == ACPI_DESC_TYPE_NAMED))
         {
             ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
                 "Arg (%p) is an ObjRef(Node), storing in node %p\n",
@@ -721,7 +718,7 @@ AcpiDsStoreObjectToLocal (
              * Store this object into the Node
              * (perform the indirect store)
              */
-            Status = AcpiNsAttachObject ((ACPI_NAMESPACE_NODE *) CurrentObjDesc, 
+            Status = AcpiNsAttachObject ((ACPI_NAMESPACE_NODE *) CurrentObjDesc,
                             ObjDesc, ObjDesc->Common.Type);
             return_ACPI_STATUS (Status);
         }