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 6494f247cf697ffcfd169381efa89bcdec0e34a6..25c13cb0ee32afa0bebe495a55ec27b3599c9f31 100644 (file)
--- a/iokit/Kernel/IOStartIOKit.cpp
+++ b/iokit/Kernel/IOStartIOKit.cpp
@@ -1,5 +1,5 @@
 /*
 /*

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

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -43,6 +43,7 @@
 #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>
 


@@ -51,10 +52,12 @@
 extern "C" {
 
 extern void OSlibkernInit (void);
 extern "C" {
 
 extern void OSlibkernInit (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;
 


@@ -62,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


@@ -70,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;
 


@@ -156,6 +171,9 @@ void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
     IOUserClient::initialize();
     IOMemoryDescriptor::initialize();
 
     IOUserClient::initialize();
     IOMemoryDescriptor::initialize();
 

+    // Initializes IOPMinformeeList class-wide shared lock
+    IOPMinformeeList::getSharedRecursiveLock();
+

     obj = OSString::withCString( version );
     assert( obj );
     if( obj ) {
     obj = OSString::withCString( version );
     assert( obj );
     if( obj ) {


@@ -179,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" */