1 files changed, 21 insertions, 22 deletions

diff --git a/sys/contrib/dev/acpica/psargs.c b/sys/contrib/dev/acpica/psargs.c
index 1ea0986..bb26cbe 100644
--- a/sys/contrib/dev/acpica/psargs.c
+++ b/sys/contrib/dev/acpica/psargs.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: psargs - Parse AML opcode arguments
- *              $Revision: 43 $
+ *              $Revision: 47 $
  *
  *****************************************************************************/
 
@@ -121,7 +121,7 @@
 #include "amlcode.h"
 #include "acnamesp.h"
 
-#define _COMPONENT          PARSER
+#define _COMPONENT          ACPI_PARSER
         MODULE_NAME         ("psargs")
 
 
@@ -351,7 +351,7 @@ AcpiPsGetNextNamepath (
     {
         /* Null name case, create a null namepath object */
 
-        AcpiPsInitOp (Arg, AML_NAMEPATH_OP);
+        AcpiPsInitOp (Arg, AML_INT_NAMEPATH_OP);
         Arg->Value.Name = Path;
         return_VOID;
     }
@@ -384,12 +384,12 @@ AcpiPsGetNextNamepath (
                 Count = AcpiPsGetArg (Op, 0);
                 if (Count && Count->Opcode == AML_BYTE_OP)
                 {
-                    NameOp = AcpiPsAllocOp (AML_NAMEPATH_OP);
+                    NameOp = AcpiPsAllocOp (AML_INT_NAMEPATH_OP);
                     if (NameOp)
                     {
                         /* Change arg into a METHOD CALL and attach the name */
 
-                        AcpiPsInitOp (Arg, AML_METHODCALL_OP);
+                        AcpiPsInitOp (Arg, AML_INT_METHODCALL_OP);
 
                         NameOp->Value.Name = Path;
 
@@ -421,7 +421,7 @@ AcpiPsGetNextNamepath (
      * pathname
      */
 
-    AcpiPsInitOp (Arg, AML_NAMEPATH_OP);
+    AcpiPsInitOp (Arg, AML_INT_NAMEPATH_OP);
     Arg->Value.Name = Path;
 
 
@@ -455,7 +455,7 @@ AcpiPsGetNextNamepath (
     {
         /* Null name case, create a null namepath object */
 
-        AcpiPsInitOp (Arg, AML_NAMEPATH_OP);
+        AcpiPsInitOp (Arg, AML_INT_NAMEPATH_OP);
         Arg->Value.Name = Path;
         return_VOID;
     }
@@ -488,16 +488,15 @@ AcpiPsGetNextNamepath (
             if (Node->Type == ACPI_TYPE_METHOD)
             {
                 MethodNode = Node;
-                DEBUG_PRINT (TRACE_PARSE,
-                    ("PsGetNextNamepath: method - %p Path=%p\n",
+                DEBUG_PRINTP (TRACE_PARSE, ("method - %p Path=%p\n",
                     MethodNode, Path));
 
-                NameOp = AcpiPsAllocOp (AML_NAMEPATH_OP);
+                NameOp = AcpiPsAllocOp (AML_INT_NAMEPATH_OP);
                 if (NameOp)
                 {
                     /* Change arg into a METHOD CALL and attach name to it */
 
-                    AcpiPsInitOp (Arg, AML_METHODCALL_OP);
+                    AcpiPsInitOp (Arg, AML_INT_METHODCALL_OP);
 
                     NameOp->Value.Name = Path;
 
@@ -531,7 +530,7 @@ AcpiPsGetNextNamepath (
      * pathname.
      */
 
-    AcpiPsInitOp (Arg, AML_NAMEPATH_OP);
+    AcpiPsInitOp (Arg, AML_INT_NAMEPATH_OP);
     Arg->Value.Name = Path;
 
 
@@ -614,7 +613,7 @@ AcpiPsGetNextSimpleArg (
     case ARGP_NAME:
     case ARGP_NAMESTRING:
 
-        AcpiPsInitOp (Arg, AML_NAMEPATH_OP);
+        AcpiPsInitOp (Arg, AML_INT_NAMEPATH_OP);
         Arg->Value.Name = AcpiPsGetNextNamestring (ParserState);
         break;
     }
@@ -639,7 +638,7 @@ ACPI_PARSE_OBJECT *
 AcpiPsGetNextField (
     ACPI_PARSE_STATE        *ParserState)
 {
-    ACPI_PTRDIFF            AmlOffset = ParserState->Aml -
+    UINT32                  AmlOffset = ParserState->Aml -
                                         ParserState->AmlStart;
     ACPI_PARSE_OBJECT       *Field;
     UINT16                  Opcode;
@@ -656,20 +655,20 @@ AcpiPsGetNextField (
 
     default:
 
-        Opcode = AML_NAMEDFIELD_OP;
+        Opcode = AML_INT_NAMEDFIELD_OP;
         break;
 
 
     case 0x00:
 
-        Opcode = AML_RESERVEDFIELD_OP;
+        Opcode = AML_INT_RESERVEDFIELD_OP;
         ParserState->Aml++;
         break;
 
 
     case 0x01:
 
-        Opcode = AML_ACCESSFIELD_OP;
+        Opcode = AML_INT_ACCESSFIELD_OP;
         ParserState->Aml++;
         break;
     }
@@ -686,7 +685,7 @@ AcpiPsGetNextField (
 
         switch (Opcode)
         {
-        case AML_NAMEDFIELD_OP:
+        case AML_INT_NAMEDFIELD_OP:
 
             /* Get the 4-character name */
 
@@ -700,7 +699,7 @@ AcpiPsGetNextField (
             break;
 
 
-        case AML_RESERVEDFIELD_OP:
+        case AML_INT_RESERVEDFIELD_OP:
 
             /* Get the length which is encoded as a package length */
 
@@ -708,7 +707,7 @@ AcpiPsGetNextField (
             break;
 
 
-        case AML_ACCESSFIELD_OP:
+        case AML_INT_ACCESSFIELD_OP:
 
             /* Get AccessType and AccessAtrib and merge into the field Op */
 
@@ -821,7 +820,7 @@ AcpiPsGetNextArg (
         {
             /* non-empty list */
 
-            Arg = AcpiPsAllocOp (AML_BYTELIST_OP);
+            Arg = AcpiPsAllocOp (AML_INT_BYTELIST_OP);
             if (Arg)
             {
                 /* fill in bytelist data */
@@ -847,7 +846,7 @@ AcpiPsGetNextArg (
             {
                 /* NullName or NameString */
 
-                Arg = AcpiPsAllocOp (AML_NAMEPATH_OP);
+                Arg = AcpiPsAllocOp (AML_INT_NAMEPATH_OP);
                 if (Arg)
                 {
                     AcpiPsGetNextNamepath (ParserState, Arg, ArgCount, 0);