xnu-792.1.5.tar.gz

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

diff --git a/iokit/Kernel/IOStartIOKit.cpp b/iokit/Kernel/IOStartIOKit.cpp
index a5ce3807961f502cfc0240395814a6f3acb918f5..010c14c5926caecd034677bc956781465a7da47d 100644 (file)
--- a/iokit/Kernel/IOStartIOKit.cpp
+++ b/iokit/Kernel/IOStartIOKit.cpp
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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. 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,
  * 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_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -30,6 +27,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>


@@ -42,73 +40,27 @@
 
 #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);

 
 #include <kern/clock.h>
 
 
 #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 )
 {
 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
 #ifndef i386

-    IOService::waitForService(
-        IOService::resourceMatching("IONVRAM"), &t );
+       IOService::waitForService(
+               IOService::resourceMatching("IONVRAM"), &t );

 #endif
 
 #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();
 }
 
     clock_initialize_calendar();
 }
 


@@ -127,8 +79,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;
 


@@ -146,8 +96,6 @@ void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
     IOLibInit(); 
     OSlibkernInit();
 
     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.
    /*****
     * Declare the fake kmod_info structs for built-in components
     * that must be tracked as independent units for dependencies.


@@ -178,8 +126,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());
         }


@@ -197,7 +150,7 @@ void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
     IOUserClient::initialize();
     IOMemoryDescriptor::initialize();
 
     IOUserClient::initialize();
     IOMemoryDescriptor::initialize();
 

-    obj = OSString::withCString( iokit_version );
+    obj = OSString::withCString( version );

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