From 13714f26c0af0fccd2ee258ca91b905af2db12e2 Mon Sep 17 00:00:00 2001
From: aystarik <aystarik>
Date: Wed, 29 Jun 2005 19:21:27 +0000
Subject: [PATCH] Added correct constants for switch

date	2001.11.30.21.21.00;	author rmoore1;	state Exp;
---
 source/components/utilities/utobject.c | 72 +++++++++++++-------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/source/components/utilities/utobject.c b/source/components/utilities/utobject.c
index bd60a852a..1fc1a9bf4 100644
--- a/source/components/utilities/utobject.c
+++ b/source/components/utilities/utobject.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: utobject - ACPI object create/delete/size/cache routines
- *              $Revision: 1.60 $
+ *              $Revision: 1.63 $
  *
  *****************************************************************************/
 
@@ -237,35 +237,35 @@ AcpiUtValidInternalObject (
 
     /* Check the descriptor type field */
 
-    if (!VALID_DESCRIPTOR_TYPE (Object, ACPI_DESC_TYPE_INTERNAL))
+    switch (ACPI_GET_DESCRIPTOR_TYPE (Object))
     {
-        /* Not an ACPI internal object, do some further checking */
+    case ACPI_DESC_TYPE_INTERNAL:
 
-        if (VALID_DESCRIPTOR_TYPE (Object, ACPI_DESC_TYPE_NAMED))
-        {
-            ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
-                "**** Obj %p is a named obj, not ACPI obj\n", Object));
-        }
+        /* The object appears to be a valid ACPI_OPERAND_OBJECT  */
 
-        else if (VALID_DESCRIPTOR_TYPE (Object, ACPI_DESC_TYPE_PARSER))
-        {
-            ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
-                "**** Obj %p is a parser obj, not ACPI obj\n", Object));
-        }
+        return (TRUE);
+        break;
 
-        else
-        {
-            ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
-                "**** Obj %p is of unknown type\n", Object));
-        }
+    case ACPI_DESC_TYPE_NAMED:
 
-        return (FALSE);
+        ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
+            "**** Obj %p is a named obj, not ACPI obj\n", Object));
+        break;
+
+    case ACPI_DESC_TYPE_PARSER:
+
+        ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
+            "**** Obj %p is a parser obj, not ACPI obj\n", Object));
+        break;
+
+    default:
+
+        ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
+            "**** Obj %p is of unknown type\n", Object));
+        break;
     }
 
-
-    /* The object appears to be a valid ACPI_OPERAND_OBJECT  */
-
-    return (TRUE);
+    return (FALSE);
 }
 
 
@@ -309,7 +309,7 @@ AcpiUtAllocateObjectDescDbg (
 
     /* Mark the descriptor type */
 
-    Object->Common.DataType = ACPI_DESC_TYPE_INTERNAL;
+    ACPI_SET_DESCRIPTOR_TYPE (Object, ACPI_DESC_TYPE_INTERNAL);
 
     ACPI_DEBUG_PRINT ((ACPI_DB_ALLOCATIONS, "%p Size %X\n",
             Object, sizeof (ACPI_OPERAND_OBJECT)));
@@ -339,7 +339,7 @@ AcpiUtDeleteObjectDesc (
 
     /* Object must be an ACPI_OPERAND_OBJECT  */
 
-    if (Object->Common.DataType != ACPI_DESC_TYPE_INTERNAL)
+    if (ACPI_GET_DESCRIPTOR_TYPE (Object) != ACPI_DESC_TYPE_INTERNAL)
     {
         ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
             "Obj %p is not an ACPI object\n", Object));
@@ -419,7 +419,7 @@ AcpiUtGetSimpleObjectSize (
 
     Length = sizeof (ACPI_OBJECT);
 
-    if (VALID_DESCRIPTOR_TYPE (InternalObject, ACPI_DESC_TYPE_NAMED))
+    if (ACPI_GET_DESCRIPTOR_TYPE (InternalObject) == ACPI_DESC_TYPE_NAMED)
     {
         /* Object is a named object (reference), just return the length */
 
@@ -532,7 +532,7 @@ AcpiUtGetElementLength (
 
     switch (ObjectType)
     {
-    case 0:
+    case ACPI_COPY_TYPE_SIMPLE:
 
         /*
          * Simple object - just get the size (Null object/entry is handled
@@ -548,18 +548,15 @@ AcpiUtGetElementLength (
         break;
 
 
-    case 1:
-        /* Package - nothing much to do here, let the walk handle it */
+    case ACPI_COPY_TYPE_PACKAGE:
+
+        /* Package object - nothing much to do here, let the walk handle it */
 
         Info->NumPackages++;
         State->Pkg.ThisTargetObj = NULL;
         break;
-
-    default:
-        return (AE_BAD_PARAMETER);
     }
 
-
     return (Status);
 }
 
@@ -599,6 +596,10 @@ AcpiUtGetPackageObjectSize (
 
     Status = AcpiUtWalkPackageTree (InternalObject, NULL,
                             AcpiUtGetElementLength, &Info);
+    if (ACPI_FAILURE (Status))
+    {
+        return_ACPI_STATUS (Status);
+    }
 
     /*
      * We have handled all of the objects in all levels of the package.
@@ -640,12 +641,11 @@ AcpiUtGetObjectSize(
     FUNCTION_ENTRY ();
 
 
-    if ((VALID_DESCRIPTOR_TYPE (InternalObject, ACPI_DESC_TYPE_INTERNAL)) &&
-        (IS_THIS_OBJECT_TYPE (InternalObject, ACPI_TYPE_PACKAGE)))
+    if ((ACPI_GET_DESCRIPTOR_TYPE (InternalObject) == ACPI_DESC_TYPE_INTERNAL) &&
+        (InternalObject->Common.Type == ACPI_TYPE_PACKAGE))
     {
         Status = AcpiUtGetPackageObjectSize (InternalObject, ObjLength);
     }
-
     else
     {
         Status = AcpiUtGetSimpleObjectSize (InternalObject, ObjLength);