xnu-1228.5.20.tar.gz

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

diff --git a/iokit/Kernel/IOStartIOKit.cpp b/iokit/Kernel/IOStartIOKit.cpp
index 9f5b2600b18630e5a30427d1fdc0221cb74cc772..25c13cb0ee32afa0bebe495a55ec27b3599c9f31 100644 (file)
--- a/iokit/Kernel/IOStartIOKit.cpp
+++ b/iokit/Kernel/IOStartIOKit.cpp
@@ -1,16 +1,19 @@
 /*
 /*

- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_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
  * 
  * 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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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.
+ * 
+ * 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
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * 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. 
  */
 /*
  * Copyright (c) 1998,1999 Apple Computer, Inc.  All rights reserved. 


@@ -30,6 +33,7 @@
  */
 
 #include <libkern/c++/OSUnserialize.h>
  */
 
 #include <libkern/c++/OSUnserialize.h>

+#include <libkern/version.h>

 #include <IOKit/IORegistryEntry.h>
 #include <IOKit/IODeviceTreeSupport.h>
 #include <IOKit/IOCatalogue.h>
 #include <IOKit/IORegistryEntry.h>
 #include <IOKit/IODeviceTreeSupport.h>
 #include <IOKit/IOCatalogue.h>


@@ -39,17 +43,21 @@
 #include <IOKit/IOLib.h>
 #include <IOKit/IOKitKeys.h>
 #include <IOKit/IOKitDebug.h>
 #include <IOKit/IOLib.h>
 #include <IOKit/IOKitKeys.h>
 #include <IOKit/IOKitDebug.h>

+#include <IOKit/pwr_mgt/IOPMinformeeList.h>

 
 #include <IOKit/assert.h>
 
 
 #include <IOKit/assert.h>
 

+#include "IOKitKernelInternal.h"
+

 extern "C" {
 
 extern void OSlibkernInit (void);
 extern "C" {
 
 extern void OSlibkernInit (void);

-extern void IOLibInit(void);
+extern void ml_hpet_cfg(uint32_t, uint32_t);

 
 #include <kern/clock.h>
 
 #include <kern/clock.h>

+#include <sys/time.h>

 
 

-void IOKitResetTime( void )
+void IOKitInitializeTime( void )

 {
        mach_timespec_t         t;
 
 {
        mach_timespec_t         t;
 


@@ -57,7 +65,7 @@ void IOKitResetTime( void )
        t.tv_nsec = 0;
        IOService::waitForService(
                IOService::resourceMatching("IORTC"), &t );
        t.tv_nsec = 0;
        IOService::waitForService(
                IOService::resourceMatching("IORTC"), &t );

-#ifndef i386
+#ifdef ppc

        IOService::waitForService(
                IOService::resourceMatching("IONVRAM"), &t );
 #endif
        IOService::waitForService(
                IOService::resourceMatching("IONVRAM"), &t );
 #endif


@@ -65,6 +73,18 @@ void IOKitResetTime( void )
     clock_initialize_calendar();
 }
 
     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;
 
 // From <osfmk/kern/debug.c>
 extern int debug_mode;
 


@@ -80,8 +100,6 @@ void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
     OSCollectionIterator *      kmodIter;   // must release
     OSString *                  kmodName;   // don't release
 
     OSCollectionIterator *      kmodIter;   // must release
     OSString *                  kmodName;   // don't release
 

-    IOLog( iokit_version );
-

     if( PE_parse_boot_arg( "io", &debugFlags ))
        gIOKitDebug = debugFlags;
 
     if( PE_parse_boot_arg( "io", &debugFlags ))
        gIOKitDebug = debugFlags;
 


@@ -129,8 +147,13 @@ void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
                 "an invalid version.\n",
                 kmodName->getCStringNoCopy());
         }
                 "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());
         }
             panic("Failure declaring in-kernel kmod \"%s\".\n",
                 kmodName->getCStringNoCopy());
         }


@@ -148,7 +171,10 @@ void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
     IOUserClient::initialize();
     IOMemoryDescriptor::initialize();
 
     IOUserClient::initialize();
     IOMemoryDescriptor::initialize();
 

-    obj = OSString::withCString( iokit_version );
+    // Initializes IOPMinformeeList class-wide shared lock
+    IOPMinformeeList::getSharedRecursiveLock();
+
+    obj = OSString::withCString( version );

     assert( obj );
     if( obj ) {
         root->setProperty( kIOKitBuildVersionKey, obj );
     assert( obj );
     if( obj ) {
         root->setProperty( kIOKitBuildVersionKey, obj );


@@ -171,7 +197,32 @@ void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
         gIOCatalogue->recordStartupExtensions();
 
         rootNub->registerService();
         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" */
 }; /* extern "C" */