xnu-517.9.5.tar.gz

[apple/xnu.git] / iokit / Kernel / IOStartIOKit.cpp

diff --git a/iokit/Kernel/IOStartIOKit.cpp b/iokit/Kernel/IOStartIOKit.cpp
index 23268cd622e79b4c298c1fcb760b49fe32f80bc7..ab928aefb4b5bc6a7cf80c181e0f1d069c12175d 100644 (file)
--- a/iokit/Kernel/IOStartIOKit.cpp
+++ b/iokit/Kernel/IOStartIOKit.cpp
@@ -36,8 +36,6 @@
 #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>
 
@@ -48,23 +46,24 @@ 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 )
 {
@@ -82,6 +81,11 @@ void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
 
     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
@@ -92,9 +96,6 @@ void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
     IOLibInit(); 
     OSlibkernInit();
 
-    IOLog("_cppInit done\n");
-
-
    /*****
     * Declare the fake kmod_info structs for built-in components
     * that must be tracked as independent units for dependencies.
@@ -143,8 +144,6 @@ void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
     IOCatalogue::initialize();
     IOUserClient::initialize();
     IOMemoryDescriptor::initialize();
-    IONetworkController::initialize();
-    IODisplay::initialize();
 
     obj = OSString::withCString( iokit_version );
     assert( obj );
@@ -158,11 +157,6 @@ void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
        obj->release();
     }
 
-#ifdef i386
-    // pretend there's no device-tree for intel
-    p1 = 0;
-#endif
-
     rootNub = new IOPlatformExpertDevice;
 
     if( rootNub && rootNub->initWithArgs( p1, p2, p3, p4)) {