X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/de355530ae67247cbd0da700edb3a2a1dae884c2..b36670cedae0009469e8ee117453de831de64a6b:/iokit/Kernel/IOStartIOKit.cpp

diff --git a/iokit/Kernel/IOStartIOKit.cpp b/iokit/Kernel/IOStartIOKit.cpp
index 1121d5ef3..010c14c59 100644
--- a/iokit/Kernel/IOStartIOKit.cpp
+++ b/iokit/Kernel/IOStartIOKit.cpp
@@ -27,6 +27,7 @@
  */
 
 #include <libkern/c++/OSUnserialize.h>
+#include <libkern/version.h>
 #include <IOKit/IORegistryEntry.h>
 #include <IOKit/IODeviceTreeSupport.h>
 #include <IOKit/IOCatalogue.h>
@@ -39,76 +40,32 @@
 
 #include <IOKit/assert.h>
 
+#include "IOKitKernelInternal.h"
+
 extern "C" {
 
 extern void OSlibkernInit (void);
-extern void IOLibInit(void);
 
 #include <kern/clock.h>
 
-/*XXX power management hacks XXX*/
-#include <IOKit/IOReturn.h>
-#include <IOKit/IOMessage.h>
-
-extern void *registerSleepWakeInterest(
-						void		*callback,
-						void		*target,
-						void		*refCon);
-/*XXX power management hacks XXX*/
-
-static void
-calend_wakeup_resynch(
-	thread_call_param_t		p0,
-	thread_call_param_t		p1)
-{
-	void		IOKitResetTime(void);
-
-	IOKitResetTime();
-}
-
-static thread_call_t	calend_sleep_wake_call;
-
-static IOReturn
-calend_sleep_wake_notif(
-	void			*target,
-	void			*refCon,
-	unsigned int	messageType,
-	void			*provider,
-	void			*messageArg,
-	vm_size_t		argSize)
-{
-	if (messageType != kIOMessageSystemHasPoweredOn)
-		return (kIOReturnUnsupported);
-
-	if (calend_sleep_wake_call != NULL)
-		thread_call_enter(calend_sleep_wake_call);
-
-	return (kIOReturnSuccess);
-}
-
 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
 
-	if (calend_sleep_wake_call == NULL) {
-		calend_sleep_wake_call = thread_call_allocate(
-											calend_wakeup_resynch, NULL);
-
-		registerSleepWakeInterest((void *)calend_sleep_wake_notif, NULL, NULL);
-	}
-
     clock_initialize_calendar();
 }
 
+// From <osfmk/kern/debug.c>
+extern int debug_mode;
 
 void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
 {
@@ -122,10 +79,13 @@ void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
     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
@@ -136,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.
@@ -169,8 +126,13 @@ void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
                 "an invalid version.\n",
                 kmodName->getCStringNoCopy());
         }
-        if (KERN_SUCCESS != kmod_create_fake(kmodName->getCStringNoCopy(),
-                kmodVersion->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)) {
             panic("Failure declaring in-kernel kmod \"%s\".\n",
                 kmodName->getCStringNoCopy());
         }
@@ -188,7 +150,7 @@ void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
     IOUserClient::initialize();
     IOMemoryDescriptor::initialize();
 
-    obj = OSString::withCString( iokit_version );
+    obj = OSString::withCString( version );
     assert( obj );
     if( obj ) {
         root->setProperty( kIOKitBuildVersionKey, obj );