Vendor import of Intel ACPI-CA 20070320

1 files changed, 16 insertions, 16 deletions

diff --git a/sys/contrib/dev/acpica/exnames.c b/sys/contrib/dev/acpica/exnames.c
index e45bcb3..1304adb 100644
--- a/sys/contrib/dev/acpica/exnames.c
+++ b/sys/contrib/dev/acpica/exnames.c
@@ -2,7 +2,7 @@
 /******************************************************************************
  *
  * Module Name: exnames - interpreter/scanner name load/execute
- *              $Revision: 1.103 $
+ *              $Revision: 1.111 $
  *
  *****************************************************************************/
 
@@ -10,7 +10,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2005, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2007, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -162,7 +162,7 @@ AcpiExAllocateNameString (
     char                    *NameString;
     UINT32                   SizeNeeded;
 
-    ACPI_FUNCTION_TRACE ("ExAllocateNameString");
+    ACPI_FUNCTION_TRACE (ExAllocateNameString);
 
 
     /*
@@ -185,11 +185,11 @@ AcpiExAllocateNameString (
      * Allocate a buffer for the name.
      * This buffer must be deleted by the caller!
      */
-    NameString = ACPI_MEM_ALLOCATE (SizeNeeded);
+    NameString = ACPI_ALLOCATE (SizeNeeded);
     if (!NameString)
     {
-        ACPI_REPORT_ERROR ((
-            "ExAllocateNameString: Could not allocate size %d\n", SizeNeeded));
+        ACPI_ERROR ((AE_INFO,
+            "Could not allocate size %d", SizeNeeded));
         return_PTR (NULL);
     }
 
@@ -260,7 +260,7 @@ AcpiExNameSegment (
     char                    CharBuf[5];
 
 
-    ACPI_FUNCTION_TRACE ("ExNameSegment");
+    ACPI_FUNCTION_TRACE (ExNameSegment);
 
 
     /*
@@ -271,14 +271,14 @@ AcpiExNameSegment (
 
     if ('0' <= CharBuf[0] && CharBuf[0] <= '9')
     {
-        ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "leading digit: %c\n", CharBuf[0]));
+        ACPI_ERROR ((AE_INFO, "Invalid leading digit: %c", CharBuf[0]));
         return_ACPI_STATUS (AE_CTRL_PENDING);
     }
 
     ACPI_DEBUG_PRINT ((ACPI_DB_LOAD, "Bytes from stream:\n"));
 
     for (Index = 0;
-        (Index < ACPI_NAME_SIZE) && (AcpiUtValidAcpiCharacter (*AmlAddress));
+        (Index < ACPI_NAME_SIZE) && (AcpiUtValidAcpiChar (*AmlAddress, 0));
         Index++)
     {
         CharBuf[Index] = *AmlAddress++;
@@ -324,12 +324,12 @@ AcpiExNameSegment (
          * the required 4
          */
         Status = AE_AML_BAD_NAME;
-        ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-            "Bad character %02x in name, at %p\n",
+        ACPI_ERROR ((AE_INFO,
+            "Bad character %02x in name, at %p",
             *AmlAddress, AmlAddress));
     }
 
-    *InAmlAddress = (UINT8 *) AmlAddress;
+    *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress);
     return_ACPI_STATUS (Status);
 }
 
@@ -366,7 +366,7 @@ AcpiExGetNameString (
     BOOLEAN                 HasPrefix = FALSE;
 
 
-    ACPI_FUNCTION_TRACE_PTR ("ExGetNameString", AmlAddress);
+    ACPI_FUNCTION_TRACE_PTR (ExGetNameString, AmlAddress);
 
 
     if (ACPI_TYPE_LOCAL_REGION_FIELD == DataType   ||
@@ -537,8 +537,8 @@ AcpiExGetNameString (
     {
         /* Ran out of segments after processing a prefix */
 
-        ACPI_REPORT_ERROR (
-            ("ExDoName: Malformed Name at %p\n", NameString));
+        ACPI_ERROR ((AE_INFO,
+            "Malformed Name at %p", NameString));
         Status = AE_AML_BAD_NAME;
     }
 
@@ -546,7 +546,7 @@ AcpiExGetNameString (
     {
         if (NameString)
         {
-            ACPI_MEM_FREE (NameString);
+            ACPI_FREE (NameString);
         }
         return_ACPI_STATUS (Status);
     }