Index: acpi.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/acpica/acpi.c,v
retrieving revision 1.19
diff -u -r1.19 acpi.c
--- acpi.c	2001/06/24 02:37:38	1.19
+++ acpi.c	2001/06/24 12:32:08
@@ -57,7 +57,7 @@
 /*
  * Hooks for the ACPI CA debugging infrastructure
  */
-#define _COMPONENT	ACPI_BUS_MANAGER
+#define _COMPONENT	ACPI_BUS
 MODULE_NAME("ACPI")
 
 /*
@@ -1347,27 +1347,27 @@
 };
 
 static struct debugtag	dbg_layer[] = {
-    {"GLOBAL",			0x00000001},
-    {"COMMON",			0x00000002},
-    {"PARSER",			0x00000004},
-    {"DISPATCHER",		0x00000008},
-    {"INTERPRETER",		0x00000010},
-    {"NAMESPACE",		0x00000020},
-    {"RESOURCE_MANAGER",	0x00000040},
-    {"TABLE_MANAGER",		0x00000080},
-    {"EVENT_HANDLING",		0x00000100},
-    {"HARDWARE",		0x00000200},
-    {"MISCELLANEOUS",		0x00000400},
-    {"OS_DEPENDENT",		0x00000800},
-    {"BUS_MANAGER",		0x00001000},
-    {"PROCESSOR_CONTROL",	0x00002000},
-    {"SYSTEM_CONTROL",		0x00004000},
-    {"THERMAL_CONTROL",		0x00008000},
-    {"POWER_CONTROL",		0x00010000},
-    {"EMBEDDED_CONTROLLER",	0x00020000},
-    {"BATTERY",			0x00040000},
-    {"DEBUGGER",		0x00100000},
-    {"ALL_COMPONENTS",		0x001FFFFF},
+    {"UTILITIES",		0x00000001},
+    {"HARDWARE",		0x00000002},
+    {"EVENTS",			0x00000004},
+    {"TABLES",			0x00000008},
+    {"NAMESPACE",		0x00000010},
+    {"PARSER",			0x00000020},
+    {"DISPATCHER",		0x00000040},
+    {"EXECUTER",		0x00000080},
+    {"RESOURCES",		0x00000100},
+    {"DEBUGGER",		0x00000200},
+    {"OS_SERVICES",		0x00000400},
+    {"BUS",			0x00001000},
+    {"SYSTEM",			0x00002000},
+    {"POWER",			0x00004000},
+    {"EC",			0x00008000},
+    {"AC_ADAPTER",		0x00010000},
+    {"BATTERY",			0x00020000},
+    {"BUTTON",			0x00040000},
+    {"PROCESSOR",		0x00080000},
+    {"THERMAL",			0x00100000},
+    {"ALL_COMPONENTS",		0x00FFFFFF},
     {NULL, 0}
 };
 
@@ -1379,6 +1379,7 @@
     {"ACPI_FATAL",                  0x00000010},    
     {"ACPI_DEBUG_OBJECT",           0x00000020},    
     {"ACPI_ALL",                    0x0000003F},    
+    {"TRACE_THREADS",               0x00000080},    
     {"TRACE_PARSE",                 0x00000100},    
     {"TRACE_DISPATCH",              0x00000200},    
     {"TRACE_LOAD",                  0x00000400},    
@@ -1398,7 +1399,8 @@
     {"TRACE_USER_REQUESTS",         0x01000000},    
     {"TRACE_PACKAGE",               0x02000000},    
     {"TRACE_MUTEX",                 0x04000000},    
-    {"TRACE_ALL",                   0x0FFFFF00},    
+    {"TRACE_INIT",                  0x08000000},    
+    {"TRACE_ALL",                   0x0FFFFF80},    
     {"VERBOSE_AML_DISASSEMBLE",     0x10000000},    
     {"VERBOSE_INFO",                0x20000000},    
     {"VERBOSE_TABLES",              0x40000000},    
Index: acpi_ec.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/acpica/acpi_ec.c,v
retrieving revision 1.11
diff -u -r1.11 acpi_ec.c
--- acpi_ec.c	2001/05/29 20:13:34	1.11
+++ acpi_ec.c	2001/06/24 07:53:05
@@ -152,7 +152,7 @@
 /*
  * Hooks for the ACPI CA debugging infrastructure
  */
-#define _COMPONENT	ACPI_EMBEDDED_CONTROLLER
+#define _COMPONENT	ACPI_EC
 MODULE_NAME("EC")
 
 struct acpi_ec_softc {
Index: acpi_isa.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/acpica/acpi_isa.c,v
retrieving revision 1.4
diff -u -r1.4 acpi_isa.c
--- acpi_isa.c	2001/05/29 20:13:34	1.4
+++ acpi_isa.c	2001/06/24 07:53:24
@@ -46,7 +46,7 @@
 /*
  * Hooks for the ACPI CA debugging infrastructure
  */
-#define _COMPONENT	ACPI_BUS_MANAGER
+#define _COMPONENT	ACPI_BUS
 MODULE_NAME("ISA")
 
 #define PNP_HEXTONUM(c) ((c) >= 'a'		\
Index: acpi_pcib.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/acpica/acpi_pcib.c,v
retrieving revision 1.7
diff -u -r1.7 acpi_pcib.c
--- acpi_pcib.c	2001/05/29 20:13:34	1.7
+++ acpi_pcib.c	2001/06/24 07:53:43
@@ -42,7 +42,7 @@
 /*
  * Hooks for the ACPI CA debugging infrastructure
  */
-#define _COMPONENT	ACPI_BUS_MANAGER
+#define _COMPONENT	ACPI_BUS
 MODULE_NAME("PCI")
 
 struct acpi_pcib_softc {
Index: acpi_processor.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/acpica/acpi_processor.c,v
retrieving revision 1.5
diff -u -r1.5 acpi_processor.c
--- acpi_processor.c	2001/05/29 20:13:34	1.5
+++ acpi_processor.c	2001/06/24 07:58:24
@@ -157,7 +157,7 @@
 /*
  * Hooks for the ACPI CA debugging infrastructure
  */
-#define _COMPONENT	ACPI_PROCESSOR_CONTROL
+#define _COMPONENT	ACPI_PROCESSOR
 MODULE_NAME("PROCESSOR")
 
 #define PR_MAX_POWER_STATES		4
Index: acpi_resource.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/acpica/acpi_resource.c,v
retrieving revision 1.3
diff -u -r1.3 acpi_resource.c
--- acpi_resource.c	2001/05/29 20:13:34	1.3
+++ acpi_resource.c	2001/06/24 07:54:01
@@ -41,7 +41,7 @@
 /*
  * Hooks for the ACPI CA debugging infrastructure
  */
-#define _COMPONENT	ACPI_BUS_MANAGER
+#define _COMPONENT	ACPI_BUS
 MODULE_NAME("RESOURCE")
 
 /*
Index: acpi_thermal.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/acpica/acpi_thermal.c,v
retrieving revision 1.7
diff -u -r1.7 acpi_thermal.c
--- acpi_thermal.c	2001/06/23 10:38:25	1.7
+++ acpi_thermal.c	2001/06/24 07:54:33
@@ -39,7 +39,7 @@
 /*
  * Hooks for the ACPI CA debugging infrastructure
  */
-#define _COMPONENT	ACPI_THERMAL_ZONE
+#define _COMPONENT	ACPI_THERMAL
 MODULE_NAME("THERMAL")
 
 #define TZ_ZEROC	2732