Vendor import of the Intel ACPI CA 20010816 update.

1 files changed, 85 insertions, 40 deletions

diff --git a/sys/contrib/dev/acpica/acoutput.h b/sys/contrib/dev/acpica/acoutput.h
index de793d7650a8..48cf7bd54d70 100644
--- a/sys/contrib/dev/acpica/acoutput.h
+++ b/sys/contrib/dev/acpica/acoutput.h
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acoutput.h -- debug output
- *       $Revision: 80 $
+ *       $Revision: 81 $
  *
  *****************************************************************************/
 
@@ -123,7 +123,7 @@
  * component basis and a per-exception-type basis.
  */
 
-/* Component IDs -- used in the global "DebugLayer" */
+/* Component IDs are used in the global "DebugLayer" */
 
 #define ACPI_UTILITIES              0x00000001
 #define ACPI_HARDWARE               0x00000002
@@ -157,59 +157,104 @@
 #define ACPI_TOOLS                  0x20000000
 
 
+/*
+ * Raw debug output levels, do not use these in the DEBUG_PRINT macros
+ */
+
+#define ACPI_LV_OK                  0x00000001
+#define ACPI_LV_INFO                0x00000002
+#define ACPI_LV_WARN                0x00000004
+#define ACPI_LV_ERROR               0x00000008
+#define ACPI_LV_FATAL               0x00000010
+#define ACPI_LV_DEBUG_OBJECT        0x00000020
+#define ACPI_LV_ALL_EXCEPTIONS      0x0000003F
+
+
+/* Trace level -- also used in the global "DebugLevel" */
+
+#define ACPI_LV_THREADS             0x00000080
+#define ACPI_LV_PARSE               0x00000100
+#define ACPI_LV_DISPATCH            0x00000200
+#define ACPI_LV_LOAD                0x00000400
+#define ACPI_LV_EXEC                0x00000800
+#define ACPI_LV_NAMES               0x00001000
+#define ACPI_LV_OPREGION            0x00002000
+#define ACPI_LV_BFIELD              0x00004000
+#define ACPI_LV_TRASH               0x00008000
+#define ACPI_LV_TABLES              0x00010000
+#define ACPI_LV_FUNCTIONS           0x00020000
+#define ACPI_LV_VALUES              0x00040000
+#define ACPI_LV_OBJECTS             0x00080000
+#define ACPI_LV_ALLOCATIONS         0x00100000
+#define ACPI_LV_RESOURCES           0x00200000
+#define ACPI_LV_IO                  0x00400000
+#define ACPI_LV_INTERRUPTS          0x00800000
+#define ACPI_LV_USER_REQUESTS       0x01000000
+#define ACPI_LV_PACKAGE             0x02000000
+#define ACPI_LV_MUTEX               0x04000000
+#define ACPI_LV_INIT                0x08000000
+#define ACPI_LV_ALL                 0x0FFFFF80
+
+
+/*
+ * Debug level macros that are used in the DEBUG_PRINT macros
+ */
+
+#define ACPI_DEBUG_LEVEL(val)       val,_COMPONENT,_ProcName,_THIS_MODULE,__LINE__
+
 /* Exception level -- used in the global "DebugLevel" */
 
-#define ACPI_OK                     0x00000001
-#define ACPI_INFO                   0x00000002
-#define ACPI_WARN                   0x00000004
-#define ACPI_ERROR                  0x00000008
-#define ACPI_FATAL                  0x00000010
-#define ACPI_DEBUG_OBJECT           0x00000020
-#define ACPI_ALL                    0x0000003F
+#define ACPI_DB_OK                  ACPI_DEBUG_LEVEL (ACPI_LV_OK)
+#define ACPI_DB_INFO                ACPI_DEBUG_LEVEL (ACPI_LV_INFO)
+#define ACPI_DB_WARN                ACPI_DEBUG_LEVEL (ACPI_LV_WARN)
+#define ACPI_DB_ERROR               ACPI_DEBUG_LEVEL (ACPI_LV_ERROR)
+#define ACPI_DB_FATAL               ACPI_DEBUG_LEVEL (ACPI_LV_FATAL)
+#define ACPI_DB_DEBUG_OBJECT        ACPI_DEBUG_LEVEL (ACPI_LV_DEBUG_OBJECT)
+#define ACPI_DB_ALL_EXCEPTIONS      ACPI_DEBUG_LEVEL (ACPI_LV_ALL_EXCEPTIONS)
 
 
 /* Trace level -- also used in the global "DebugLevel" */
 
-#define TRACE_THREADS               0x00000080
-#define TRACE_PARSE                 0x00000100
-#define TRACE_DISPATCH              0x00000200
-#define TRACE_LOAD                  0x00000400
-#define TRACE_EXEC                  0x00000800
-#define TRACE_NAMES                 0x00001000
-#define TRACE_OPREGION              0x00002000
-#define TRACE_BFIELD                0x00004000
-#define TRACE_TRASH                 0x00008000
-#define TRACE_TABLES                0x00010000
-#define TRACE_FUNCTIONS             0x00020000
-#define TRACE_VALUES                0x00040000
-#define TRACE_OBJECTS               0x00080000
-#define TRACE_ALLOCATIONS           0x00100000
-#define TRACE_RESOURCES             0x00200000
-#define TRACE_IO                    0x00400000
-#define TRACE_INTERRUPTS            0x00800000
-#define TRACE_USER_REQUESTS         0x01000000
-#define TRACE_PACKAGE               0x02000000
-#define TRACE_MUTEX                 0x04000000
-#define TRACE_INIT                  0x08000000
-
-#define TRACE_ALL                   0x0FFFFF80
+#define ACPI_DB_THREADS             ACPI_DEBUG_LEVEL (ACPI_LV_THREADS)
+#define ACPI_DB_PARSE               ACPI_DEBUG_LEVEL (ACPI_LV_PARSE)
+#define ACPI_DB_DISPATCH            ACPI_DEBUG_LEVEL (ACPI_LV_DISPATCH)
+#define ACPI_DB_LOAD                ACPI_DEBUG_LEVEL (ACPI_LV_LOAD)
+#define ACPI_DB_EXEC                ACPI_DEBUG_LEVEL (ACPI_LV_EXEC)
+#define ACPI_DB_NAMES               ACPI_DEBUG_LEVEL (ACPI_LV_NAMES)
+#define ACPI_DB_OPREGION            ACPI_DEBUG_LEVEL (ACPI_LV_OPREGION)
+#define ACPI_DB_BFIELD              ACPI_DEBUG_LEVEL (ACPI_LV_BFIELD)
+#define ACPI_DB_TRASH               ACPI_DEBUG_LEVEL (ACPI_LV_TRASH)
+#define ACPI_DB_TABLES              ACPI_DEBUG_LEVEL (ACPI_LV_TABLES)
+#define ACPI_DB_FUNCTIONS           ACPI_DEBUG_LEVEL (ACPI_LV_FUNCTIONS)
+#define ACPI_DB_VALUES              ACPI_DEBUG_LEVEL (ACPI_LV_VALUES)
+#define ACPI_DB_OBJECTS             ACPI_DEBUG_LEVEL (ACPI_LV_OBJECTS)
+#define ACPI_DB_ALLOCATIONS         ACPI_DEBUG_LEVEL (ACPI_LV_ALLOCATIONS)
+#define ACPI_DB_RESOURCES           ACPI_DEBUG_LEVEL (ACPI_LV_RESOURCES)
+#define ACPI_DB_IO                  ACPI_DEBUG_LEVEL (ACPI_LV_IO)
+#define ACPI_DB_INTERRUPTS          ACPI_DEBUG_LEVEL (ACPI_LV_INTERRUPTS)
+#define ACPI_DB_USER_REQUESTS       ACPI_DEBUG_LEVEL (ACPI_LV_USER_REQUESTS)
+#define ACPI_DB_PACKAGE             ACPI_DEBUG_LEVEL (ACPI_LV_PACKAGE)
+#define ACPI_DB_MUTEX               ACPI_DEBUG_LEVEL (ACPI_LV_MUTEX)
+#define ACPI_DB_INIT                ACPI_DEBUG_LEVEL (ACPI_LV_INIT)
+
+#define ACPI_DB_ALL                 ACPI_DEBUG_LEVEL (0x0FFFFF80)
 
 
 /* Exceptionally verbose output -- also used in the global "DebugLevel"  */
 
-#define VERBOSE_AML_DISASSEMBLE     0x10000000
-#define VERBOSE_INFO                0x20000000
-#define VERBOSE_TABLES              0x40000000
-#define VERBOSE_EVENTS              0x80000000
+#define ACPI_DB_AML_DISASSEMBLE     0x10000000
+#define ACPI_DB_VERBOSE_INFO        0x20000000
+#define ACPI_DB_FULL_TABLES         0x40000000
+#define ACPI_DB_EVENTS              0x80000000
 
-#define VERBOSE_ALL                 0xF0000000
+#define ACPI_DB_VERBOSE             0xF0000000
 
 
 /* Defaults for DebugLevel, debug and normal */
 
-#define DEBUG_DEFAULT               (ACPI_OK | ACPI_WARN | ACPI_ERROR | ACPI_DEBUG_OBJECT)
-#define NORMAL_DEFAULT              (ACPI_OK | ACPI_WARN | ACPI_ERROR | ACPI_DEBUG_OBJECT)
-#define DEBUG_ALL                   (VERBOSE_AML_DISASSEMBLE | TRACE_ALL | ACPI_ALL)
+#define DEBUG_DEFAULT               (ACPI_LV_OK | ACPI_LV_WARN | ACPI_LV_ERROR | ACPI_LV_DEBUG_OBJECT)
+#define NORMAL_DEFAULT              (ACPI_LV_OK | ACPI_LV_WARN | ACPI_LV_ERROR | ACPI_LV_DEBUG_OBJECT)
+#define DEBUG_ALL                   (ACPI_LV_AML_DISASSEMBLE | ACPI_LV_ALL_EXCEPTIONS | ACPI_LV_ALL)
 
 /* Misc defines */