1 files changed, 32 insertions, 37 deletions

diff --git a/sys/contrib/dev/acpica/exoparg2.c b/sys/contrib/dev/acpica/exoparg2.c
index 719116d..71c946b 100644
--- a/sys/contrib/dev/acpica/exoparg2.c
+++ b/sys/contrib/dev/acpica/exoparg2.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: exoparg2 - AML execution - opcodes with 2 arguments
- *              $Revision: 98 $
+ *              $Revision: 104 $
  *
  *****************************************************************************/
 
@@ -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
@@ -127,7 +127,7 @@
 
 
 #define _COMPONENT          ACPI_EXECUTER
-        MODULE_NAME         ("exoparg2")
+        ACPI_MODULE_NAME    ("exoparg2")
 
 
 /*!
@@ -177,7 +177,7 @@ AcpiExOpcode_2A_0T_0R (
     ACPI_STATUS             Status = AE_OK;
 
 
-    FUNCTION_TRACE_STR ("ExOpcode_2A_0T_0R", AcpiPsGetOpcodeName (WalkState->Opcode));
+    ACPI_FUNCTION_TRACE_STR ("ExOpcode_2A_0T_0R", AcpiPsGetOpcodeName (WalkState->Opcode));
 
 
     /* Examine the opcode */
@@ -191,39 +191,37 @@ AcpiExOpcode_2A_0T_0R (
 
         Node = (ACPI_NAMESPACE_NODE *) Operand[0];
 
-        /* The node must refer to a device or thermal zone */
+        /* The node must refer to a device or thermal zone or processor */
 
-        if (Node && Operand[1])     /* TBD: is this check necessary? */
+        switch (Node->Type)
         {
-            switch (Node->Type)
-            {
-            case ACPI_TYPE_DEVICE:
-            case ACPI_TYPE_THERMAL:
+        case ACPI_TYPE_DEVICE:
+        case ACPI_TYPE_THERMAL:
+        case ACPI_TYPE_PROCESSOR:
 
-                /*
-                 * Dispatch the notify to the appropriate handler
-                 * NOTE: the request is queued for execution after this method
-                 * completes.  The notify handlers are NOT invoked synchronously
-                 * from this thread -- because handlers may in turn run other
-                 * control methods.
-                 */
-                Status = AcpiEvQueueNotifyRequest (Node,
-                                        (UINT32) Operand[1]->Integer.Value);
-                break;
+            /*
+             * Dispatch the notify to the appropriate handler
+             * NOTE: the request is queued for execution after this method
+             * completes.  The notify handlers are NOT invoked synchronously
+             * from this thread -- because handlers may in turn run other
+             * control methods.
+             */
+            Status = AcpiEvQueueNotifyRequest (Node,
+                                    (UINT32) Operand[1]->Integer.Value);
+            break;
 
-            default:
-                ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Unexpected notify object type %X\n",
-                    Node->Type));
+        default:
+            ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Unexpected notify object type %X\n",
+                Node->Type));
 
-                Status = AE_AML_OPERAND_TYPE;
-                break;
-            }
+            Status = AE_AML_OPERAND_TYPE;
+            break;
         }
         break;
 
     default:
 
-        REPORT_ERROR (("AcpiExOpcode_2A_0T_0R: Unknown opcode %X\n", WalkState->Opcode));
+        ACPI_REPORT_ERROR (("AcpiExOpcode_2A_0T_0R: Unknown opcode %X\n", WalkState->Opcode));
         Status = AE_AML_BAD_OPCODE;
     }
 
@@ -254,7 +252,7 @@ AcpiExOpcode_2A_2T_1R (
     ACPI_STATUS             Status;
 
 
-    FUNCTION_TRACE_STR ("ExOpcode_2A_2T_1R", AcpiPsGetOpcodeName (WalkState->Opcode));
+    ACPI_FUNCTION_TRACE_STR ("ExOpcode_2A_2T_1R", AcpiPsGetOpcodeName (WalkState->Opcode));
 
 
     /*
@@ -291,11 +289,10 @@ AcpiExOpcode_2A_2T_1R (
 
     default:
 
-        REPORT_ERROR (("AcpiExOpcode_2A_2T_1R: Unknown opcode %X\n",
+        ACPI_REPORT_ERROR (("AcpiExOpcode_2A_2T_1R: Unknown opcode %X\n",
                 WalkState->Opcode));
         Status = AE_AML_BAD_OPCODE;
         goto Cleanup;
-        break;
     }
 
 
@@ -360,7 +357,7 @@ AcpiExOpcode_2A_1T_1R (
     ACPI_STATUS             Status      = AE_OK;
 
 
-    FUNCTION_TRACE_STR ("ExOpcode_2A_1T_1R", AcpiPsGetOpcodeName (WalkState->Opcode));
+    ACPI_FUNCTION_TRACE_STR ("ExOpcode_2A_1T_1R", AcpiPsGetOpcodeName (WalkState->Opcode));
 
 
     /*
@@ -453,7 +450,7 @@ AcpiExOpcode_2A_1T_1R (
 
     case AML_CONCAT_RES_OP:         /* ConcatenateResTemplate (Buffer, Buffer, Result) (ACPI 2.0) */
 
-        Status = AE_NOT_IMPLEMENTED;
+        Status = AcpiExConcatTemplate (Operand[0], Operand[1], &ReturnDesc, WalkState);
         break;
 
 
@@ -540,12 +537,11 @@ AcpiExOpcode_2A_1T_1R (
 
         WalkState->ResultObj = ReturnDesc;
         goto Cleanup;
-        break;
 
 
     default:
 
-        REPORT_ERROR (("AcpiExOpcode_2A_1T_1R: Unknown opcode %X\n",
+        ACPI_REPORT_ERROR (("AcpiExOpcode_2A_1T_1R: Unknown opcode %X\n",
                 WalkState->Opcode));
         Status = AE_AML_BAD_OPCODE;
         break;
@@ -605,7 +601,7 @@ AcpiExOpcode_2A_0T_1R (
     BOOLEAN                 LogicalResult = FALSE;
 
 
-    FUNCTION_TRACE_STR ("ExOpcode_2A_0T_1R", AcpiPsGetOpcodeName (WalkState->Opcode));
+    ACPI_FUNCTION_TRACE_STR ("ExOpcode_2A_0T_1R", AcpiPsGetOpcodeName (WalkState->Opcode));
 
 
     /* Create the internal return object */
@@ -655,10 +651,9 @@ AcpiExOpcode_2A_0T_1R (
 
     default:
 
-        REPORT_ERROR (("AcpiExOpcode_2A_0T_1R: Unknown opcode %X\n", WalkState->Opcode));
+        ACPI_REPORT_ERROR (("AcpiExOpcode_2A_0T_1R: Unknown opcode %X\n", WalkState->Opcode));
         Status = AE_AML_BAD_OPCODE;
         goto Cleanup;
-        break;
     }