xnu-4570.51.1.tar.gz

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

diff --git a/iokit/Kernel/IOStartIOKit.cpp b/iokit/Kernel/IOStartIOKit.cpp
index 8177603cc2e9042d3b710818ce23a2d440d1aee7..6eb48b713b9b4e884454b18d0755cb0f97e112bd 100644 (file)
--- a/iokit/Kernel/IOStartIOKit.cpp
+++ b/iokit/Kernel/IOStartIOKit.cpp
@@ -43,8 +43,8 @@
 #include <IOKit/IOStatisticsPrivate.h>
 #include <IOKit/IOKitKeysPrivate.h>
 #include <IOKit/IOInterruptAccountingPrivate.h>
-
 #include <IOKit/assert.h>
+#include <sys/conf.h>
 
 #include "IOKitKernelInternal.h"
 
@@ -53,6 +53,10 @@ OSSet *          gIORemoveOnReadProperties;
 
 extern "C" {
 
+void StartIOKit( void * p1, void * p2, void * p3, void * p4 );
+void IORegistrySetOSBuildVersion(char * build_version);
+void IORecordProgressBackbuffer(void * buffer, size_t size, uint32_t theme);
+
 extern void OSlibkernInit (void);
 
 void iokit_post_constructor_init(void);
@@ -73,7 +77,7 @@ void IOKitInitializeTime( void )
                IOService::resourceMatching("IONVRAM"), &t );
 #endif
 
-    clock_initialize_calendar();
+       clock_initialize_calendar();
 }
 
 void iokit_post_constructor_init(void)
@@ -108,9 +112,6 @@ void iokit_post_constructor_init(void)
     }
 }
 
-// From <osfmk/kern/debug.c>
-extern int debug_mode;
-
 /*****
  * Pointer into bootstrap KLD segment for functions never used past startup.
  */
@@ -133,10 +134,6 @@ void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
     // Compat for boot-args
     gIOKitTrace |= (gIOKitDebug & kIOTraceCompatBootArgs);
        
-    // Check for the log synchronous bit set in io
-    if (gIOKitDebug & kIOLogSynchronous)
-        debug_mode = true;
-
     if( PE_parse_boot_argn( "pmtimeout", &debugFlags, sizeof (debugFlags) ))
         gCanSleepTimeout = debugFlags;
     //
@@ -148,6 +145,7 @@ void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
     //
     IOLibInit(); 
     OSlibkernInit();
+    devsw_init();
 
     gIOProgressBackbufferKey  = OSSymbol::withCStringNoCopy(kIOProgressBackbufferKey);
     gIORemoveOnReadProperties = OSSet::withObjects((const OSObject **) &gIOProgressBackbufferKey, 1);