Vendor import of the Intel ACPI CA 20010816 update.

1 files changed, 23 insertions, 23 deletions

diff --git a/sys/contrib/dev/acpica/uteval.c b/sys/contrib/dev/acpica/uteval.c
index d805e73..57fbe75 100644
--- a/sys/contrib/dev/acpica/uteval.c
+++ b/sys/contrib/dev/acpica/uteval.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: uteval - Object evaluation
- *              $Revision: 28 $
+ *              $Revision: 29 $
  *
  *****************************************************************************/
 
@@ -162,12 +162,12 @@ AcpiUtEvaluateNumericObject (
     {
         if (Status == AE_NOT_FOUND)
         {
-            DEBUG_PRINTP (ACPI_INFO, ("%s on %4.4s was not found\n", 
+            ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "%s on %4.4s was not found\n", 
                 ObjectName, &DeviceNode->Name));
         }
         else
         {
-            DEBUG_PRINTP (ACPI_ERROR, ("%s on %4.4s failed with status %s\n", 
+            ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "%s on %4.4s failed with status %s\n", 
                 ObjectName, &DeviceNode->Name,
                 AcpiFormatException (Status)));
         }
@@ -180,7 +180,7 @@ AcpiUtEvaluateNumericObject (
 
     if (!ObjDesc)
     {
-        DEBUG_PRINTP (ACPI_ERROR, ("No object was returned from %s\n", 
+        ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "No object was returned from %s\n", 
             ObjectName));
         return_ACPI_STATUS (AE_TYPE);
     }
@@ -190,8 +190,8 @@ AcpiUtEvaluateNumericObject (
     if (ObjDesc->Common.Type != ACPI_TYPE_INTEGER)
     {
         Status = AE_TYPE;
-        DEBUG_PRINTP (ACPI_ERROR, 
-            ("Type returned from %s was not a number: %X \n",
+        ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, 
+            "Type returned from %s was not a number: %X \n",
             ObjectName, ObjDesc->Common.Type));
     }
     else
@@ -247,13 +247,13 @@ AcpiUtExecute_HID (
     {
         if (Status == AE_NOT_FOUND)
         {
-            DEBUG_PRINTP (ACPI_INFO, ("_HID on %4.4s was not found\n",
+            ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "_HID on %4.4s was not found\n",
                 &DeviceNode->Name));
         }
 
         else
         {
-            DEBUG_PRINTP (ACPI_ERROR, ("_HID on %4.4s failed %s\n",
+            ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "_HID on %4.4s failed %s\n",
                 &DeviceNode->Name, AcpiFormatException (Status)));
         }
 
@@ -264,7 +264,7 @@ AcpiUtExecute_HID (
 
     if (!ObjDesc)
     {
-        DEBUG_PRINTP (ACPI_ERROR, ("No object was returned from _HID\n"));
+        ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "No object was returned from _HID\n"));
         return_ACPI_STATUS (AE_TYPE);
     }
 
@@ -276,8 +276,8 @@ AcpiUtExecute_HID (
         (ObjDesc->Common.Type != ACPI_TYPE_STRING))
     {
         Status = AE_TYPE;
-        DEBUG_PRINTP (ACPI_ERROR,
-            ("Type returned from _HID not a number or string: %s(%X) \n",
+        ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+            "Type returned from _HID not a number or string: %s(%X) \n",
             AcpiUtGetTypeName (ObjDesc->Common.Type), ObjDesc->Common.Type));
     }
 
@@ -343,14 +343,14 @@ AcpiUtExecute_UID (
     {
         if (Status == AE_NOT_FOUND)
         {
-            DEBUG_PRINTP (ACPI_INFO, ("_UID on %4.4s was not found\n",
+            ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "_UID on %4.4s was not found\n",
                 &DeviceNode->Name));
         }
 
         else
         {
-            DEBUG_PRINTP (ACPI_ERROR,
-                ("_UID on %4.4s failed %s\n",
+            ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+                "_UID on %4.4s failed %s\n",
                 &DeviceNode->Name, AcpiFormatException (Status)));
         }
 
@@ -361,7 +361,7 @@ AcpiUtExecute_UID (
 
     if (!ObjDesc)
     {
-        DEBUG_PRINTP (ACPI_ERROR, ("No object was returned from _UID\n"));
+        ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "No object was returned from _UID\n"));
         return (AE_TYPE);
     }
 
@@ -373,8 +373,8 @@ AcpiUtExecute_UID (
         (ObjDesc->Common.Type != ACPI_TYPE_STRING))
     {
         Status = AE_TYPE;
-        DEBUG_PRINTP (ACPI_ERROR,
-            ("Type returned from _UID was not a number or string: %X \n",
+        ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+            "Type returned from _UID was not a number or string: %X \n",
             ObjDesc->Common.Type));
     }
 
@@ -438,8 +438,8 @@ AcpiUtExecute_STA (
                                      METHOD_NAME__STA, NULL, &ObjDesc);
     if (AE_NOT_FOUND == Status)
     {
-        DEBUG_PRINTP (ACPI_INFO,
-            ("_STA on %4.4s was not found, assuming present.\n",
+        ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
+            "_STA on %4.4s was not found, assuming present.\n",
             &DeviceNode->Name));
 
         *Flags = 0x0F;
@@ -448,7 +448,7 @@ AcpiUtExecute_STA (
 
     else if (ACPI_FAILURE (Status))
     {
-        DEBUG_PRINTP (ACPI_ERROR, ("_STA on %4.4s failed %s\n",
+        ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "_STA on %4.4s failed %s\n",
             &DeviceNode->Name,
             AcpiFormatException (Status)));
     }
@@ -459,7 +459,7 @@ AcpiUtExecute_STA (
 
         if (!ObjDesc)
         {
-            DEBUG_PRINTP (ACPI_ERROR, ("No object was returned from _STA\n"));
+            ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "No object was returned from _STA\n"));
             return_ACPI_STATUS (AE_TYPE);
         }
 
@@ -468,8 +468,8 @@ AcpiUtExecute_STA (
         if (ObjDesc->Common.Type != ACPI_TYPE_INTEGER)
         {
             Status = AE_TYPE;
-            DEBUG_PRINTP (ACPI_ERROR,
-                ("Type returned from _STA was not a number: %X \n",
+            ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+                "Type returned from _STA was not a number: %X \n",
                 ObjDesc->Common.Type));
         }