Import ACPICA 20130517.

1 files changed, 12 insertions, 6 deletions

diff --git a/source/components/debugger/dbxface.c b/source/components/debugger/dbxface.c
index a6a5423..3c1df5b 100644
--- a/source/components/debugger/dbxface.c
+++ b/source/components/debugger/dbxface.c
@@ -232,9 +232,11 @@ AcpiDbSingleStep (
     {
     case AML_CLASS_UNKNOWN:
     case AML_CLASS_ARGUMENT:    /* constants, literals, etc. do nothing */
+
         return (AE_OK);
 
     default:
+
         /* All other opcodes -- continue */
         break;
     }
@@ -408,6 +410,9 @@ AcpiDbInitialize (
     ACPI_STATUS             Status;
 
 
+    ACPI_FUNCTION_TRACE (DbInitialize);
+
+
     /* Init globals */
 
     AcpiGbl_DbBuffer            = NULL;
@@ -427,7 +432,7 @@ AcpiDbInitialize (
     AcpiGbl_DbBuffer = AcpiOsAllocate (ACPI_DEBUG_BUFFER_SIZE);
     if (!AcpiGbl_DbBuffer)
     {
-        return (AE_NO_MEMORY);
+        return_ACPI_STATUS (AE_NO_MEMORY);
     }
     ACPI_MEMSET (AcpiGbl_DbBuffer, 0, ACPI_DEBUG_BUFFER_SIZE);
 
@@ -450,14 +455,14 @@ AcpiDbInitialize (
         if (ACPI_FAILURE (Status))
         {
             AcpiOsPrintf ("Could not get debugger mutex\n");
-            return (Status);
+            return_ACPI_STATUS (Status);
         }
 
         Status = AcpiUtAcquireMutex (ACPI_MTX_DEBUG_CMD_READY);
         if (ACPI_FAILURE (Status))
         {
             AcpiOsPrintf ("Could not get debugger mutex\n");
-            return (Status);
+            return_ACPI_STATUS (Status);
         }
 
         /* Create the debug execution thread to execute commands */
@@ -465,8 +470,8 @@ AcpiDbInitialize (
         Status = AcpiOsExecute (OSL_DEBUGGER_THREAD, AcpiDbExecuteThread, NULL);
         if (ACPI_FAILURE (Status))
         {
-            AcpiOsPrintf ("Could not start debugger thread\n");
-            return (Status);
+            ACPI_EXCEPTION ((AE_INFO, Status, "Could not start debugger thread"));
+            return_ACPI_STATUS (Status);
         }
     }
 
@@ -476,7 +481,7 @@ AcpiDbInitialize (
         AcpiGbl_DbOpt_stats = FALSE;
     }
 
-    return (AE_OK);
+    return_ACPI_STATUS (AE_OK);
 }
 
 
@@ -500,6 +505,7 @@ AcpiDbTerminate (
     if (AcpiGbl_DbBuffer)
     {
         AcpiOsFree (AcpiGbl_DbBuffer);
+        AcpiGbl_DbBuffer = NULL;
     }
 }