--- xnu/xnu-792.17.14/iokit/Kernel/IOStartIOKit.cpp
+++ xnu/xnu-201/iokit/Kernel/IOStartIOKit.cpp
@@ -1,29 +1,23 @@
 /*
  * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_HEADER_START@
  * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@
  */
 /*
  * Copyright (c) 1998,1999 Apple Computer, Inc.  All rights reserved. 
@@ -33,7 +27,6 @@
  */
 
 #include <libkern/c++/OSUnserialize.h>
-#include <libkern/version.h>
 #include <IOKit/IORegistryEntry.h>
 #include <IOKit/IODeviceTreeSupport.h>
 #include <IOKit/IOCatalogue.h>
@@ -46,32 +39,76 @@
 
 #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;
-
-	t.tv_sec = 30;
-	t.tv_nsec = 0;
-	IOService::waitForService(
-		IOService::resourceMatching("IORTC"), &t );
+    mach_timespec_t	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(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 )
 {
@@ -85,13 +122,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
@@ -102,6 +136,9 @@
     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.
@@ -132,13 +169,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());
         }
@@ -156,7 +188,7 @@
     IOUserClient::initialize();
     IOMemoryDescriptor::initialize();
 
-    obj = OSString::withCString( version );
+    obj = OSString::withCString( iokit_version );
     assert( obj );
     if( obj ) {
         root->setProperty( kIOKitBuildVersionKey, obj );