Vendor import of the Intel ACPI CA 20010816 update.

1 files changed, 14 insertions, 3 deletions

diff --git a/sys/contrib/dev/acpica/psargs.c b/sys/contrib/dev/acpica/psargs.c
index bb26cbe7db4a..61482e59c970 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: 47 $
+ *              $Revision: 50 $
  *
  *****************************************************************************/
 
@@ -398,7 +398,7 @@ AcpiPsGetNextNamepath (
                         NameOp->Node = (ACPI_NAMESPACE_NODE *) Op;
                         AcpiPsAppendArg (Arg, NameOp);
 
-                        *ArgCount = Count->Value.Integer &
+                        *ArgCount = (UINT32) Count->Value.Integer &
                                     METHOD_FLAGS_ARG_COUNT;
                     }
                 }
@@ -488,7 +488,7 @@ AcpiPsGetNextNamepath (
             if (Node->Type == ACPI_TYPE_METHOD)
             {
                 MethodNode = Node;
-                DEBUG_PRINTP (TRACE_PARSE, ("method - %p Path=%p\n",
+                ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "method - %p Path=%p\n",
                     MethodNode, Path));
 
                 NameOp = AcpiPsAllocOp (AML_INT_NAMEPATH_OP);
@@ -597,6 +597,17 @@ AcpiPsGetNextSimpleArg (
         break;
 
 
+    case ARGP_QWORDDATA:
+
+        AcpiPsInitOp (Arg, AML_QWORD_OP);
+
+        /* Get 8 bytes from the AML stream */
+
+        MOVE_UNALIGNED64_TO_64 (&Arg->Value.Integer, ParserState->Aml);
+        ParserState->Aml += 8;
+        break;
+
+
     case ARGP_CHARLIST:
 
         AcpiPsInitOp (Arg, AML_STRING_OP);