xnu-1228.tar.gz

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

diff --git a/iokit/Kernel/IOStartIOKit.cpp b/iokit/Kernel/IOStartIOKit.cpp
index 33c3731d80e363f7636d0ea8e82b1d0aff7e1568..25c13cb0ee32afa0bebe495a55ec27b3599c9f31 100644 (file)
--- a/iokit/Kernel/IOStartIOKit.cpp
+++ b/iokit/Kernel/IOStartIOKit.cpp
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 1998-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * 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.
+ * 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * Copyright (c) 1998,1999 Apple Computer, Inc.  All rights reserved. 
@@ -37,6 +43,7 @@
 #include <IOKit/IOLib.h>
 #include <IOKit/IOKitKeys.h>
 #include <IOKit/IOKitDebug.h>
+#include <IOKit/pwr_mgt/IOPMinformeeList.h>
 
 #include <IOKit/assert.h>
 
@@ -48,8 +55,9 @@ extern void OSlibkernInit (void);
 extern void ml_hpet_cfg(uint32_t, uint32_t);
 
 #include <kern/clock.h>
+#include <sys/time.h>
 
-void IOKitResetTime( void )
+void IOKitInitializeTime( void )
 {
        mach_timespec_t         t;
 
@@ -57,15 +65,26 @@ void IOKitResetTime( void )
        t.tv_nsec = 0;
        IOService::waitForService(
                IOService::resourceMatching("IORTC"), &t );
-#ifndef i386
+#ifdef ppc
        IOService::waitForService(
                IOService::resourceMatching("IONVRAM"), &t );
-
 #endif
 
     clock_initialize_calendar();
 }
 
+void IOKitResetTime( void )
+{
+    uint32_t secs, microsecs;
+
+    clock_initialize_calendar();
+
+    clock_get_calendar_microtime(&secs, &microsecs);
+    gIOLastWakeTime.tv_sec  = secs;
+    gIOLastWakeTime.tv_usec = microsecs;
+}
+
+
 // From <osfmk/kern/debug.c>
 extern int debug_mode;
 
@@ -152,6 +171,9 @@ void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
     IOUserClient::initialize();
     IOMemoryDescriptor::initialize();
 
+    // Initializes IOPMinformeeList class-wide shared lock
+    IOPMinformeeList::getSharedRecursiveLock();
+
     obj = OSString::withCString( version );
     assert( obj );
     if( obj ) {
@@ -175,7 +197,32 @@ void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
         gIOCatalogue->recordStartupExtensions();
 
         rootNub->registerService();
+
+#if !NO_KEXTD
+       /* Add a busy count to keep the registry busy until kextd has
+        * completely finished launching. This is decremented when kextd
+        * messages the kernel after the in-kernel linker has been
+        * removed and personalities have been sent.
+        */
+        IOService::getServiceRoot()->adjustBusy(1);
+#endif
     }
 }
 
+void
+IORegistrySetOSBuildVersion(char * build_version)
+{
+    IORegistryEntry * root = IORegistryEntry::getRegistryRoot();
+
+    if (root) {
+        if (build_version) {
+            root->setProperty(kOSBuildVersionKey, build_version);
+        } else {
+            root->removeProperty(kOSBuildVersionKey);
+        }
+    }
+
+    return;
+}
+
 }; /* extern "C" */