Vendor import of the Intel ACPI CA 20020611 drop.

1 files changed, 11 insertions, 16 deletions

diff --git a/sys/contrib/dev/acpica/exstoren.c b/sys/contrib/dev/acpica/exstoren.c
index d322f84..422734d 100644
--- a/sys/contrib/dev/acpica/exstoren.c
+++ b/sys/contrib/dev/acpica/exstoren.c
@@ -3,7 +3,7 @@
  *
  * Module Name: exstoren - AML Interpreter object store support,
  *                        Store to Node (namespace object)
- *              $Revision: 47 $
+ *              $Revision: 50 $
  *
  *****************************************************************************/
 
@@ -119,12 +119,7 @@
 #define __EXSTOREN_C__
 
 #include "acpi.h"
-#include "acparser.h"
-#include "acdispat.h"
 #include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "actables.h"
 
 
 #define _COMPONENT          ACPI_EXECUTER
@@ -182,7 +177,7 @@ AcpiExResolveObject (
          * are all essentially the same.  This case handles the
          * "interchangeable" types Integer, String, and Buffer.
          */
-        if (SourceDesc->Common.Type == INTERNAL_TYPE_REFERENCE)
+        if (ACPI_GET_OBJECT_TYPE (SourceDesc) == INTERNAL_TYPE_REFERENCE)
         {
             /* Resolve a reference object first */
 
@@ -196,16 +191,16 @@ AcpiExResolveObject (
         /*
          * Must have a Integer, Buffer, or String
          */
-        if ((SourceDesc->Common.Type != ACPI_TYPE_INTEGER)     &&
-            (SourceDesc->Common.Type != ACPI_TYPE_BUFFER)      &&
-            (SourceDesc->Common.Type != ACPI_TYPE_STRING))
+        if ((ACPI_GET_OBJECT_TYPE (SourceDesc) != ACPI_TYPE_INTEGER)     &&
+            (ACPI_GET_OBJECT_TYPE (SourceDesc) != ACPI_TYPE_BUFFER)      &&
+            (ACPI_GET_OBJECT_TYPE (SourceDesc) != ACPI_TYPE_STRING))
         {
             /*
              * Conversion successful but still not a valid type
              */
             ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
                 "Cannot assign type %s to %s (must be type Int/Str/Buf)\n",
-                AcpiUtGetTypeName (SourceDesc->Common.Type),
+                AcpiUtGetObjectTypeName (SourceDesc),
                 AcpiUtGetTypeName (TargetType)));
             Status = AE_AML_OPERAND_TYPE;
         }
@@ -297,7 +292,7 @@ AcpiExStoreObjectToObject (
         return_ACPI_STATUS (Status);
     }
 
-    if (SourceDesc->Common.Type != DestDesc->Common.Type)
+    if (ACPI_GET_OBJECT_TYPE (SourceDesc) != ACPI_GET_OBJECT_TYPE (DestDesc))
     {
         /*
          * The source type does not match the type of the destination.
@@ -308,7 +303,7 @@ AcpiExStoreObjectToObject (
          * Otherwise, ActualSrcDesc is a temporary object to hold the
          * converted object.
          */
-        Status = AcpiExConvertToTargetType (DestDesc->Common.Type, SourceDesc,
+        Status = AcpiExConvertToTargetType (ACPI_GET_OBJECT_TYPE (DestDesc), SourceDesc,
                         &ActualSrcDesc, WalkState);
         if (ACPI_FAILURE (Status))
         {
@@ -320,7 +315,7 @@ AcpiExStoreObjectToObject (
      * We now have two objects of identical types, and we can perform a
      * copy of the *value* of the source object.
      */
-    switch (DestDesc->Common.Type)
+    switch (ACPI_GET_OBJECT_TYPE (DestDesc))
     {
     case ACPI_TYPE_INTEGER:
 
@@ -328,7 +323,7 @@ AcpiExStoreObjectToObject (
 
         /* Truncate value if we are executing from a 32-bit ACPI table */
 
-        AcpiExTruncateFor32bitTable (DestDesc, WalkState);
+        AcpiExTruncateFor32bitTable (DestDesc);
         break;
 
     case ACPI_TYPE_STRING:
@@ -351,7 +346,7 @@ AcpiExStoreObjectToObject (
          * All other types come here.
          */
         ACPI_DEBUG_PRINT ((ACPI_DB_WARN, "Store into type %s not implemented\n",
-            AcpiUtGetTypeName (DestDesc->Common.Type)));
+            AcpiUtGetObjectTypeName (DestDesc)));
 
         Status = AE_NOT_IMPLEMENTED;
         break;