1 files changed, 31 insertions, 13 deletions

diff --git a/sys/contrib/dev/acpica/utmisc.c b/sys/contrib/dev/acpica/utmisc.c
index dddbe27..a9e9e45 100644
--- a/sys/contrib/dev/acpica/utmisc.c
+++ b/sys/contrib/dev/acpica/utmisc.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: utmisc - common utility procedures
- *              $Revision: 46 $
+ *              $Revision: 50 $
  *
  ******************************************************************************/
 
@@ -153,6 +153,9 @@ AcpiUtValidAcpiName (
     UINT32                  i;
 
 
+    FUNCTION_ENTRY ();
+
+
     for (i = 0; i < ACPI_NAME_SIZE; i++)
     {
         if (!((NamePtr[i] == '_') ||
@@ -163,7 +166,6 @@ AcpiUtValidAcpiName (
         }
     }
 
-
     return (TRUE);
 }
 
@@ -185,11 +187,14 @@ AcpiUtValidAcpiCharacter (
     NATIVE_CHAR             Character)
 {
 
+    FUNCTION_ENTRY ();
+
     return ((BOOLEAN)   ((Character == '_') ||
                         (Character >= 'A' && Character <= 'Z') ||
                         (Character >= '0' && Character <= '9')));
 }
 
+
 /*******************************************************************************
  *
  * FUNCTION:    AcpiUtStrupr
@@ -209,6 +214,9 @@ AcpiUtStrupr (
     NATIVE_CHAR             *String;
 
 
+    FUNCTION_ENTRY ();
+
+
     /* Walk entire string, uppercasing the letters */
 
     for (String = SrcString; *String; )
@@ -576,6 +584,9 @@ AcpiUtCreateUpdateStateAndPush (
     ACPI_GENERIC_STATE       *State;
 
 
+    FUNCTION_ENTRY ();
+
+
     /* Ignore null objects; these are expected */
 
     if (!Object)
@@ -619,6 +630,9 @@ AcpiUtCreatePkgStateAndPush (
     ACPI_GENERIC_STATE       *State;
 
 
+    FUNCTION_ENTRY ();
+
+
     State = AcpiUtCreatePkgState (InternalObject, ExternalObject, Index);
     if (!State)
     {
@@ -651,6 +665,7 @@ AcpiUtPushGenericState (
 {
     FUNCTION_TRACE ("UtPushGenericState");
 
+
     /* Push the state object onto the front of the list (stack) */
 
     State->Common.Next = *ListHead;
@@ -679,7 +694,7 @@ AcpiUtPopGenericState (
     ACPI_GENERIC_STATE      *State;
 
 
-    FUNCTION_TRACE ("DsPopGenericState");
+    FUNCTION_TRACE ("UtPopGenericState");
 
 
     /* Remove the state object at the head of the list (stack) */
@@ -715,6 +730,9 @@ AcpiUtCreateGenericState (void)
     ACPI_GENERIC_STATE      *State;
 
 
+    FUNCTION_ENTRY ();
+
+
     State = AcpiUtAcquireFromCache (ACPI_MEM_LIST_STATE);
 
     /* Initialize */
@@ -841,6 +859,7 @@ AcpiUtCreateControlState (
 
     FUNCTION_TRACE ("UtCreateControlState");
 
+
     /* Create the generic state object */
 
     State = AcpiUtCreateGenericState ();
@@ -928,7 +947,7 @@ AcpiUtResolvePackageReferences (
     ACPI_OPERAND_OBJECT     *SubObject;
 
 
-    FUNCTION_TRACE ("AcpiUtResolvePackageReferences");
+    FUNCTION_TRACE ("UtResolvePackageReferences");
 
 
     if (ObjDesc->Common.Type != ACPI_TYPE_PACKAGE)
@@ -996,7 +1015,7 @@ AcpiUtDisplayInitPathname (
     char                    Buffer[128];
 
 
-    PROC_NAME ("AcpiUtDisplayInitPathname");
+    PROC_NAME ("UtDisplayInitPathname");
 
 
     Status = AcpiNsHandleToPathname (ObjHandle, &Length, Buffer);
@@ -1040,7 +1059,7 @@ AcpiUtWalkPackageTree (
     ACPI_OPERAND_OBJECT     *ThisSourceObj;
 
 
-    FUNCTION_TRACE ("AcpiUtWalkPackageTree");
+    FUNCTION_TRACE ("UtWalkPackageTree");
 
 
     State = AcpiUtCreatePkgState (SourceObject, TargetObject, 0);
@@ -1149,13 +1168,12 @@ AcpiUtWalkPackageTree (
     /* We should never get here */
 
     return (AE_AML_INTERNAL);
-
 }
 
 
 /*******************************************************************************
  *
- * FUNCTION:    _ReportError
+ * FUNCTION:    AcpiUtReportError
  *
  * PARAMETERS:  ModuleName          - Caller's module name (for error output)
  *              LineNumber          - Caller's line number (for error output)
@@ -1169,7 +1187,7 @@ AcpiUtWalkPackageTree (
  ******************************************************************************/
 
 void
-_ReportError (
+AcpiUtReportError (
     NATIVE_CHAR             *ModuleName,
     UINT32                  LineNumber,
     UINT32                  ComponentId)
@@ -1182,7 +1200,7 @@ _ReportError (
 
 /*******************************************************************************
  *
- * FUNCTION:    _ReportWarning
+ * FUNCTION:    AcpiUtReportWarning
  *
  * PARAMETERS:  ModuleName          - Caller's module name (for error output)
  *              LineNumber          - Caller's line number (for error output)
@@ -1196,7 +1214,7 @@ _ReportError (
  ******************************************************************************/
 
 void
-_ReportWarning (
+AcpiUtReportWarning (
     NATIVE_CHAR             *ModuleName,
     UINT32                  LineNumber,
     UINT32                  ComponentId)
@@ -1208,7 +1226,7 @@ _ReportWarning (
 
 /*******************************************************************************
  *
- * FUNCTION:    _ReportInfo
+ * FUNCTION:    AcpiUtReportInfo
  *
  * PARAMETERS:  ModuleName          - Caller's module name (for error output)
  *              LineNumber          - Caller's line number (for error output)
@@ -1222,7 +1240,7 @@ _ReportWarning (
  ******************************************************************************/
 
 void
-_ReportInfo (
+AcpiUtReportInfo (
     NATIVE_CHAR             *ModuleName,
     UINT32                  LineNumber,
     UINT32                  ComponentId)