1 files changed, 15 insertions, 25 deletions

diff --git a/sys/contrib/dev/acpica/dbxface.c b/sys/contrib/dev/acpica/dbxface.c
index 1d176fe..e54b420 100644
--- a/sys/contrib/dev/acpica/dbxface.c
+++ b/sys/contrib/dev/acpica/dbxface.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: dbxface - AML Debugger external interfaces
- *              $Revision: 38 $
+ *              $Revision: 41 $
  *
  ******************************************************************************/
 
@@ -157,6 +157,8 @@ AcpiDbSingleStep (
     ACPI_PARSE_OBJECT       *DisplayOp;
 
 
+    FUNCTION_ENTRY ();
+
     /* Is there a breakpoint set? */
 
     if (WalkState->MethodBreakpoint)
@@ -174,12 +176,10 @@ AcpiDbSingleStep (
         }
     }
 
-
     /*
      * Check if this is an opcode that we are interested in --
      * namely, opcodes that have arguments
      */
-
     if (Op->Opcode == AML_INT_NAMEDFIELD_OP)
     {
         return (AE_OK);
@@ -205,16 +205,14 @@ AcpiDbSingleStep (
         }
     }
 
-
     /*
      * Under certain debug conditions, display this opcode and its operands
      */
-
-    if ((OutputToFile)                      ||
+    if ((AcpiGbl_DbOutputToFile)            ||
         (AcpiGbl_CmSingleStep)              ||
         (AcpiDbgLevel & ACPI_LV_PARSE))
     {
-        if ((OutputToFile)                  ||
+        if ((AcpiGbl_DbOutputToFile)        ||
             (AcpiDbgLevel & ACPI_LV_PARSE))
         {
             AcpiOsPrintf ("\n[AmlDebug] Next AML Opcode to execute:\n");
@@ -225,7 +223,6 @@ AcpiDbSingleStep (
          * and disable parser trace output for the duration of the display because
          * we don't want the extraneous debug output)
          */
-
         OriginalDebugLevel = AcpiDbgLevel;
         AcpiDbgLevel &= ~(ACPI_LV_PARSE | ACPI_LV_FUNCTIONS);
         Next = Op->Next;
@@ -264,14 +261,12 @@ AcpiDbSingleStep (
             /* TBD */
         }
 
-
         /* Restore everything */
 
         Op->Next = Next;
         AcpiOsPrintf ("\n");
         AcpiDbgLevel = OriginalDebugLevel;
-   }
-
+    }
 
     /* If we are not single stepping, just continue executing the method */
 
@@ -285,7 +280,6 @@ AcpiDbSingleStep (
      * If we are executing a step-to-call command,
      * Check if this is a method call.
      */
-
     if (AcpiGbl_StepToNextCall)
     {
         if (Op->Opcode != AML_INT_METHODCALL_OP)
@@ -305,7 +299,6 @@ AcpiDbSingleStep (
      * If the next opcode is a method call, we will "step over" it
      * by default.
      */
-
     if (Op->Opcode == AML_INT_METHODCALL_OP)
     {
         AcpiGbl_CmSingleStep = FALSE;  /* No more single step while executing called method */
@@ -357,15 +350,14 @@ AcpiDbSingleStep (
 
             /* Get the user input line */
 
-            AcpiOsGetLine (LineBuf);
+            AcpiOsGetLine (AcpiGbl_DbLineBuf);
         }
 
-        Status = AcpiDbCommandDispatch (LineBuf, WalkState, Op);
+        Status = AcpiDbCommandDispatch (AcpiGbl_DbLineBuf, WalkState, Op);
     }
 
     /* AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE); */
 
-
     /* User commands complete, continue execution of the interrupted method */
 
     return (Status);
@@ -391,12 +383,12 @@ AcpiDbInitialize (void)
 
     /* Init globals */
 
-    Buffer = AcpiOsAllocate (BUFFER_SIZE);
+    AcpiGbl_DbBuffer = AcpiOsAllocate (ACPI_DEBUG_BUFFER_SIZE);
 
     /* Initial scope is the root */
 
-    ScopeBuf [0] = '\\';
-    ScopeBuf [1] =  0;
+    AcpiGbl_DbScopeBuf [0] = '\\';
+    AcpiGbl_DbScopeBuf [1] =  0;
 
 
     /*
@@ -404,7 +396,6 @@ AcpiDbInitialize (void)
      * a separate thread so that the front end can be in another address
      * space, environment, or even another machine.
      */
-
     if (AcpiGbl_DebuggerConfiguration & DEBUGGER_MULTI_THREADED)
     {
         /* These were created with one unit, grab it */
@@ -417,14 +408,13 @@ AcpiDbInitialize (void)
         AcpiOsQueueForExecution (0, AcpiDbExecuteThread, NULL);
     }
 
-    if (!opt_verbose)
+    if (!AcpiGbl_DbOpt_verbose)
     {
-        INDENT_STRING = "    ";
-        opt_disasm = TRUE;
-        opt_stats = FALSE;
+        AcpiGbl_DbDisasmIndent = "    ";
+        AcpiGbl_DbOpt_disasm = TRUE;
+        AcpiGbl_DbOpt_stats = FALSE;
     }
 
-
     return (0);
 }