Belated vendor update to the Intel ACPI CA 20010208 snapshot.

1 files changed, 22 insertions, 7 deletions

diff --git a/sys/contrib/dev/acpica/Subsystem/Namespace/nsinit.c b/sys/contrib/dev/acpica/Subsystem/Namespace/nsinit.c
index c8b463ca729b..672bbebc1033 100644
--- a/sys/contrib/dev/acpica/Subsystem/Namespace/nsinit.c
+++ b/sys/contrib/dev/acpica/Subsystem/Namespace/nsinit.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: nsinit - namespace initialization
- *              $Revision: 12 $
+ *              $Revision: 15 $
  *
  *****************************************************************************/
 
@@ -203,7 +203,7 @@ AcpiNsInitializeObjects (
 
 ACPI_STATUS
 AcpiNsInitializeDevices (
-    UINT32                  Flags)
+    void)
 {
     ACPI_STATUS             Status;
     ACPI_DEVICE_WALK_INFO   Info;
@@ -212,7 +212,6 @@ AcpiNsInitializeDevices (
     FUNCTION_TRACE ("NsInitializeDevices");
 
 
-    Info.Flags = Flags;
     Info.DeviceCount = 0;
     Info.Num_STA = 0;
     Info.Num_INI = 0;
@@ -304,7 +303,11 @@ AcpiNsInitOneObject (
                             AcpiCmFormatException (Status), &Node->Name));
         }
 
-        DEBUG_PRINT_RAW (ACPI_OK, ("."));
+        if (!(AcpiDbgLevel & TRACE_INIT))
+        {
+            DEBUG_PRINT_RAW (ACPI_OK, ("."));
+        }
+
         break;
 
 
@@ -324,7 +327,11 @@ AcpiNsInitOneObject (
             DEBUG_PRINT (ACPI_ERROR, ("%s while getting field arguments [%4.4s]\n",
                             AcpiCmFormatException (Status), &Node->Name));
         }
-        DEBUG_PRINT_RAW (ACPI_OK, ("."));
+        if (!(AcpiDbgLevel & TRACE_INIT))
+        {
+            DEBUG_PRINT_RAW (ACPI_OK, ("."));
+        }
+
 
         break;
 
@@ -344,7 +351,7 @@ AcpiNsInitOneObject (
  *
  * FUNCTION:    AcpiNsInitOneDevice
  *
- * PARAMETERS:  The usual "I'm a namespace callback" stuff
+ * PARAMETERS:  WALK_CALLBACK
  *
  * RETURN:      ACPI_STATUS
  *
@@ -370,7 +377,11 @@ AcpiNsInitOneDevice (
     FUNCTION_TRACE ("AcpiNsInitOneDevice");
 
 
-    DEBUG_PRINT_RAW (ACPI_OK, ("."));
+    if (!(AcpiDbgLevel & TRACE_INIT))
+    {
+        DEBUG_PRINT_RAW (ACPI_OK, ("."));
+    }
+
     Info->DeviceCount++;
 
     AcpiCmAcquireMutex (ACPI_MTX_NAMESPACE);
@@ -388,6 +399,7 @@ AcpiNsInitOneDevice (
      * Run _STA to determine if we can run _INI on the device.
      */
 
+    DEBUG_EXEC(AcpiCmDisplayInitPathname (Node, "_STA  [Method]"));
     Status = AcpiCmExecute_STA (Node, &Flags);
     if (ACPI_FAILURE (Status))
     {
@@ -404,10 +416,13 @@ AcpiNsInitOneDevice (
         return_ACPI_STATUS(AE_CTRL_DEPTH);
     }
 
+
+
     /*
      * The device is present. Run _INI.
      */
 
+    DEBUG_EXEC(AcpiCmDisplayInitPathname (ObjHandle, "_INI  [Method]"));
     Status = AcpiNsEvaluateRelative (ObjHandle, "_INI", NULL, NULL);
     if (AE_NOT_FOUND == Status)
     {