--- xnu/xnu-2422.100.13/iokit/Kernel/IOKitDebug.cpp
+++ xnu/xnu-1228/iokit/Kernel/IOKitDebug.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2010 Apple Inc. All rights reserved.
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -25,11 +25,14 @@
  * 
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
+/*
+ * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
+ *
+ * HISTORY
+ *
+ */
 
 #include <sys/sysctl.h>
-
-#include <libkern/c++/OSContainers.h>
-#include <libkern/c++/OSCPPDebug.h>
 
 #include <IOKit/IOKitDebug.h>
 #include <IOKit/IOLib.h>
@@ -37,6 +40,9 @@
 #include <IOKit/IODeviceTreeSupport.h>
 #include <IOKit/IOService.h>
 
+#include <libkern/c++/OSContainers.h>
+#include <libkern/c++/OSCPPDebug.h>
+
 #ifdef IOKITDEBUG
 #define DEBUG_INIT_VALUE IOKITDEBUG
 #else
@@ -44,10 +50,7 @@
 #endif
 
 SInt64		gIOKitDebug = DEBUG_INIT_VALUE;
-SInt64		gIOKitTrace = 0;
-
-SYSCTL_QUAD(_debug, OID_AUTO, iokit, CTLFLAG_RW | CTLFLAG_LOCKED, &gIOKitDebug, "boot_arg io");
-SYSCTL_QUAD(_debug, OID_AUTO, iotrace, CTLFLAG_RW | CTLFLAG_LOCKED, &gIOKitTrace, "trace io");
+SYSCTL_QUAD(_debug, OID_AUTO, iokit, CTLFLAG_RW, &gIOKitDebug, "boot_arg io");
 
 
 int 		debug_malloc_size;
@@ -59,11 +62,6 @@
 
 extern "C" {
 
-#if 0
-#define DEBG(fmt, args...)   { kprintf(fmt, ## args); }
-#else
-#define DEBG(fmt, args...)   { IOLog(fmt, ## args); }
-#endif
 
 void IOPrintPlane( const IORegistryPlane * plane )
 {
@@ -77,33 +75,80 @@
     assert( iter );
     all = iter->iterateAll();
     if( all) {
-        DEBG("Count %d\n", all->getCount() );
+        IOLog("Count %d\n", all->getCount() );
         all->release();
     } else
-	DEBG("Empty\n");
+	IOLog("Empty\n");
 
     iter->reset();
     while( (next = iter->getNextObjectRecursive())) {
 	snprintf(format + 1, sizeof(format) - 1, "%ds", 2 * next->getDepth( plane ));
-	DEBG( format, "");
-	DEBG( "\033[33m%s", next->getName( plane ));
+	IOLog( format, "");
+	IOLog( "\033[33m%s", next->getName( plane ));
 	if( (next->getLocation( plane )))
-            DEBG("@%s", next->getLocation( plane ));
-	DEBG("\033[0m <class %s", next->getMetaClass()->getClassName());
+            IOLog("@%s", next->getLocation( plane ));
+	IOLog("\033[0m <class %s", next->getMetaClass()->getClassName());
         if( (service = OSDynamicCast(IOService, next)))
-            DEBG(", busy %ld", (long) service->getBusyState());
-	DEBG( ">\n");
-//	IOSleep(250);
+            IOLog(", busy %ld", service->getBusyState());
+	IOLog( ">\n");
+	IOSleep(250);
     }
     iter->release();
 }
 
-void db_piokjunk(void)
-{
-}
-
-void db_dumpiojunk( const IORegistryPlane * plane __unused )
-{
+void dbugprintf(char *fmt, ...);
+void db_dumpiojunk( const IORegistryPlane * plane );
+
+void db_piokjunk(void) {
+
+	dbugprintf("\nDT plane:\n");
+	db_dumpiojunk( gIODTPlane );
+	dbugprintf("\n\nService plane:\n");
+	db_dumpiojunk( gIOServicePlane );
+    dbugprintf("\n\n"
+	    "ivar kalloc()       0x%08x\n"
+	    "malloc()            0x%08x\n"
+            "containers kalloc() 0x%08x\n"
+	    "IOMalloc()          0x%08x\n"
+            "----------------------------------------\n",
+	    debug_ivars_size,
+            debug_malloc_size,
+            debug_container_malloc_size,
+            debug_iomalloc_size
+            );
+
+}
+
+
+void db_dumpiojunk( const IORegistryPlane * plane )
+{
+    IORegistryEntry *		next;
+    IORegistryIterator * 	iter;
+    OSOrderedSet *		all;
+    char			format[] = "%xxxs";
+    IOService *			service;
+
+    iter = IORegistryIterator::iterateOver( plane );
+
+    all = iter->iterateAll();
+    if( all) {
+        dbugprintf("Count %d\n", all->getCount() );
+        all->release();
+    } else dbugprintf("Empty\n");
+
+    iter->reset();
+    while( (next = iter->getNextObjectRecursive())) {
+		snprintf(format + 1, sizeof(format) - 1, "%ds", 2 * next->getDepth( plane ));
+		dbugprintf( format, "");
+		dbugprintf( "%s", next->getName( plane ));
+		if( (next->getLocation( plane )))
+				dbugprintf("@%s", next->getLocation( plane ));
+		dbugprintf(" <class %s", next->getMetaClass()->getClassName());
+			if( (service = OSDynamicCast(IOService, next)))
+				dbugprintf(", busy %ld", service->getBusyState());
+		dbugprintf( ">\n");
+    }
+    iter->release();
 }
 
 void IOPrintMemory( void )