--- xnu/xnu-517.7.21/iokit/Kernel/IOStartIOKit.cpp
+++ xnu/xnu-123.5/iokit/Kernel/IOStartIOKit.cpp
@@ -36,6 +36,8 @@
 #include <IOKit/IOLib.h>
 #include <IOKit/IOKitKeys.h>
 #include <IOKit/IOKitDebug.h>
+#include <IOKit/network/IONetworkController.h>
+#include <IOKit/graphics/IODisplay.h>
 
 #include <IOKit/assert.h>
 
@@ -46,24 +48,23 @@
 
 #include <kern/clock.h>
 
+
 void IOKitResetTime( void )
 {
-	mach_timespec_t		t;
+    mach_timespec_t	t;
 
-	t.tv_sec = 30;
-	t.tv_nsec = 0;
-	IOService::waitForService(
-		IOService::resourceMatching("IORTC"), &t );
+    t.tv_sec = 30;
+    t.tv_nsec = 0;
+    IOService::waitForService(
+        IOService::resourceMatching("IORTC"), &t );
 #ifndef i386
-	IOService::waitForService(
-		IOService::resourceMatching("IONVRAM"), &t );
+    IOService::waitForService(
+        IOService::resourceMatching("IONVRAM"), &t );
 #endif
 
     clock_initialize_calendar();
 }
 
-// From <osfmk/kern/debug.c>
-extern int debug_mode;
 
 void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
 {
@@ -81,11 +82,6 @@
 
     if( PE_parse_boot_arg( "io", &debugFlags ))
 	gIOKitDebug = debugFlags;
-
-    // Check for the log synchronous bit set in io
-    if (gIOKitDebug & kIOLogSynchronous)
-        debug_mode = true;
-
     //
     // Have to start IOKit environment before we attempt to start
     // the C++ runtime environment.  At some stage we have to clean up
@@ -95,6 +91,9 @@
     //
     IOLibInit(); 
     OSlibkernInit();
+
+    IOLog("_cppInit done\n");
+
 
    /*****
     * Declare the fake kmod_info structs for built-in components
@@ -144,6 +143,8 @@
     IOCatalogue::initialize();
     IOUserClient::initialize();
     IOMemoryDescriptor::initialize();
+    IONetworkController::initialize();
+    IODisplay::initialize();
 
     obj = OSString::withCString( iokit_version );
     assert( obj );
@@ -156,6 +157,11 @@
         root->setProperty( kIOKitDiagnosticsKey, obj );
 	obj->release();
     }
+
+#ifdef i386
+    // pretend there's no device-tree for intel
+    p1 = 0;
+#endif
 
     rootNub = new IOPlatformExpertDevice;