1 files changed, 9 insertions, 12 deletions

diff --git a/sys/contrib/dev/acpica/dswscope.c b/sys/contrib/dev/acpica/dswscope.c
index fb6f579..4ff6ed7 100644
--- a/sys/contrib/dev/acpica/dswscope.c
+++ b/sys/contrib/dev/acpica/dswscope.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: dswscope - Scope stack manipulation
- *              $Revision: 57 $
+ *              $Revision: 59 $
  *
  *****************************************************************************/
 
@@ -198,10 +198,9 @@ AcpiDsScopeStackPush (
 
     if (!AcpiUtValidObjectType (Type))
     {
-        ACPI_REPORT_WARNING (("DsScopeStackPush: type code out of range\n"));
+        ACPI_REPORT_WARNING (("DsScopeStackPush: Invalid object type: 0x%X\n", Type));
     }
 
-
     /* Allocate a new scope object */
 
     ScopeInfo = AcpiUtCreateGenericState ();
@@ -225,25 +224,24 @@ AcpiDsScopeStackPush (
     if (OldScopeInfo)
     {
         ACPI_DEBUG_PRINT_RAW ((ACPI_DB_EXEC,
-            "[%4.4s] (%10s)",
-            OldScopeInfo->Scope.Node->Name.Ascii,
+            "[%4.4s] (%s)",
+            AcpiUtGetNodeName (OldScopeInfo->Scope.Node),
             AcpiUtGetTypeName (OldScopeInfo->Common.Value)));
     }
     else
     {
         ACPI_DEBUG_PRINT_RAW ((ACPI_DB_EXEC,
-            "[\\___] (%10s)", "ROOT"));
+            "[\\___] (%s)", "ROOT"));
     }
 
     ACPI_DEBUG_PRINT_RAW ((ACPI_DB_EXEC,
         ", New scope -> [%4.4s] (%s)\n",
-        ScopeInfo->Scope.Node->Name.Ascii,
+        AcpiUtGetNodeName (ScopeInfo->Scope.Node),
         AcpiUtGetTypeName (ScopeInfo->Common.Value)));
 
     /* Push new scope object onto stack */
 
     AcpiUtPushGenericState (&WalkState->ScopeInfo, ScopeInfo);
-
     return_ACPI_STATUS (AE_OK);
 }
 
@@ -288,9 +286,9 @@ AcpiDsScopeStackPop (
     WalkState->ScopeDepth--;
 
     ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
-        "[%.2d] Popped scope [%4.4s] (%10s), New scope -> ",
+        "[%.2d] Popped scope [%4.4s] (%s), New scope -> ",
         (UINT32) WalkState->ScopeDepth,
-        ScopeInfo->Scope.Node->Name.Ascii,
+        AcpiUtGetNodeName (ScopeInfo->Scope.Node),
         AcpiUtGetTypeName (ScopeInfo->Common.Value)));
 
     NewScopeInfo = WalkState->ScopeInfo;
@@ -298,7 +296,7 @@ AcpiDsScopeStackPop (
     {
         ACPI_DEBUG_PRINT_RAW ((ACPI_DB_EXEC,
             "[%4.4s] (%s)\n",
-            NewScopeInfo->Scope.Node->Name.Ascii,
+            AcpiUtGetNodeName (NewScopeInfo->Scope.Node),
             AcpiUtGetTypeName (NewScopeInfo->Common.Value)));
     }
     else
@@ -308,7 +306,6 @@ AcpiDsScopeStackPop (
     }
 
     AcpiUtDeleteGenericState (ScopeInfo);
-
     return_ACPI_STATUS (AE_OK);
 }