vendor/acpica/20140828

7 files changed, 27 insertions, 25 deletions

diff --git a/source/components/executer/exconvrt.c b/source/components/executer/exconvrt.c
index fbfd137deb9f..9803cb6a0528 100644
--- a/source/components/executer/exconvrt.c
+++ b/source/components/executer/exconvrt.c
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __EXCONVRT_C__
 
 #include "acpi.h"
diff --git a/source/components/executer/exdebug.c b/source/components/executer/exdebug.c
index df61b7988da1..5b13d19dca4f 100644
--- a/source/components/executer/exdebug.c
+++ b/source/components/executer/exdebug.c
@@ -82,6 +82,7 @@ AcpiExDoDebugObject (
     UINT32                  Index)
 {
     UINT32                  i;
+    UINT32                  Timer;
 
 
     ACPI_FUNCTION_TRACE_PTR (ExDoDebugObject, SourceDesc);
@@ -96,12 +97,20 @@ AcpiExDoDebugObject (
     }
 
     /*
+     * We will emit the current timer value (in microseconds) with each
+     * debug output. Only need the lower 26 bits. This allows for 67
+     * million microseconds or 67 seconds before rollover.
+     */
+    Timer = ((UINT32) AcpiOsGetTimer () / 10); /* (100 nanoseconds to microseconds) */
+    Timer &= 0x03FFFFFF;
+
+    /*
      * Print line header as long as we are not in the middle of an
      * object display
      */
     if (!((Level > 0) && Index == 0))
     {
-        AcpiOsPrintf ("[ACPI Debug] %*s", Level, " ");
+        AcpiOsPrintf ("[ACPI Debug %.8u] %*s", Timer, Level, " ");
     }
 
     /* Display the index for package output only */
diff --git a/source/components/executer/exdump.c b/source/components/executer/exdump.c
index 815e337be5b2..6e7de67bf880 100644
--- a/source/components/executer/exdump.c
+++ b/source/components/executer/exdump.c
@@ -508,7 +508,7 @@ AcpiExDumpObject (
                 }
             }
 
-            AcpiOsPrintf ("\n", Next);
+            AcpiOsPrintf ("\n");
             break;
 
         case ACPI_EXD_HDLR_LIST:
@@ -542,7 +542,7 @@ AcpiExDumpObject (
                 }
             }
 
-            AcpiOsPrintf ("\n", Next);
+            AcpiOsPrintf ("\n");
             break;
 
         case ACPI_EXD_RGN_LIST:
@@ -576,7 +576,7 @@ AcpiExDumpObject (
                 }
             }
 
-            AcpiOsPrintf ("\n", Next);
+            AcpiOsPrintf ("\n");
             break;
 
         case ACPI_EXD_NODE:
diff --git a/source/components/executer/exfield.c b/source/components/executer/exfield.c
index a1de0ca237c7..49d3b667b78e 100644
--- a/source/components/executer/exfield.c
+++ b/source/components/executer/exfield.c
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __EXFIELD_C__
 
 #include "acpi.h"
@@ -203,14 +202,13 @@ AcpiExReadDataFromField (
             Length = AcpiExGetSerialAccessLength (AccessorType,
                 ObjDesc->Field.AccessLength);
 
-	    /*
-             * Add additional 2 bytes for modeled GenericSerialBus data buffer:
-             * typedef struct {
-             *     BYTEStatus; // Byte 0 of the data buffer
-             *     BYTELength; // Byte 1 of the data buffer
-             *     BYTE[x-1]Data; // Bytes 2-x of the arbitrary length data buffer,
-             * }
-	     */
+            /*
+             * Add additional 2 bytes for the GenericSerialBus data buffer:
+             *
+             *     Status;      (Byte 0 of the data buffer)
+             *     Length;      (Byte 1 of the data buffer)
+             *     Data[x-1];   (Bytes 2-x of the arbitrary length data buffer)
+             */
             Length += 2;
             Function = ACPI_READ | (AccessorType << 16);
         }
@@ -397,14 +395,13 @@ AcpiExWriteDataToField (
             Length = AcpiExGetSerialAccessLength (AccessorType,
                 ObjDesc->Field.AccessLength);
 
-	    /*
-             * Add additional 2 bytes for modeled GenericSerialBus data buffer:
-             * typedef struct {
-             *     BYTEStatus; // Byte 0 of the data buffer
-             *     BYTELength; // Byte 1 of the data buffer
-             *     BYTE[x-1]Data; // Bytes 2-x of the arbitrary length data buffer,
-             * }
-	     */
+            /*
+             * Add additional 2 bytes for the GenericSerialBus data buffer:
+             *
+             *     Status;      (Byte 0 of the data buffer)
+             *     Length;      (Byte 1 of the data buffer)
+             *     Data[x-1];   (Bytes 2-x of the arbitrary length data buffer)
+             */
             Length += 2;
             Function = ACPI_WRITE | (AccessorType << 16);
         }
diff --git a/source/components/executer/exfldio.c b/source/components/executer/exfldio.c
index 448d455d55bd..e35559fffa5e 100644
--- a/source/components/executer/exfldio.c
+++ b/source/components/executer/exfldio.c
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __EXFLDIO_C__
 
 #include "acpi.h"
diff --git a/source/components/executer/exoparg2.c b/source/components/executer/exoparg2.c
index 8f25f7b16d59..f3e976ce536f 100644
--- a/source/components/executer/exoparg2.c
+++ b/source/components/executer/exoparg2.c
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __EXOPARG2_C__
 
 #include "acpi.h"
diff --git a/source/components/executer/exregion.c b/source/components/executer/exregion.c
index 1fa07e3490bc..7532630a232a 100644
--- a/source/components/executer/exregion.c
+++ b/source/components/executer/exregion.c
@@ -41,7 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #define __EXREGION_C__
 
 #include "acpi.h"