--- xnu/xnu-792.6.70/iokit/Kernel/IOStartIOKit.cpp
+++ xnu/xnu-124.1/iokit/Kernel/IOStartIOKit.cpp
@@ -27,7 +27,6 @@
  */
 
 #include <libkern/c++/OSUnserialize.h>
-#include <libkern/version.h>
 #include <IOKit/IORegistryEntry.h>
 #include <IOKit/IODeviceTreeSupport.h>
 #include <IOKit/IOCatalogue.h>
@@ -37,35 +36,35 @@
 #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>
-
-#include "IOKitKernelInternal.h"
 
 extern "C" {
 
 extern void OSlibkernInit (void);
+extern void IOLibInit(void);
 
 #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 )
 {
@@ -79,13 +78,10 @@
     OSCollectionIterator *      kmodIter;   // must release
     OSString *                  kmodName;   // don't release
 
+    IOLog( iokit_version );
+
     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
@@ -126,13 +125,8 @@
                 "an invalid version.\n",
                 kmodName->getCStringNoCopy());
         }
-
-	// empty version strings get replaced with current kernel version
-	const char *vers = (strlen(kmodVersion->getCStringNoCopy())
-				 ? kmodVersion->getCStringNoCopy()
-				 : osrelease);
-
-        if (KERN_SUCCESS != kmod_create_fake(kmodName->getCStringNoCopy(), vers)) {
+        if (KERN_SUCCESS != kmod_create_fake(kmodName->getCStringNoCopy(),
+                kmodVersion->getCStringNoCopy())) {
             panic("Failure declaring in-kernel kmod \"%s\".\n",
                 kmodName->getCStringNoCopy());
         }
@@ -149,8 +143,10 @@
     IOCatalogue::initialize();
     IOUserClient::initialize();
     IOMemoryDescriptor::initialize();
+    IONetworkController::initialize();
+    IODisplay::initialize();
 
-    obj = OSString::withCString( version );
+    obj = OSString::withCString( iokit_version );
     assert( obj );
     if( obj ) {
         root->setProperty( kIOKitBuildVersionKey, obj );
@@ -161,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;