X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/4452a7af2eac33dbad800bcc91f2399d62c18f53..2d21ac55c334faf3a56e5634905ed6987fc787d4:/iokit/Kernel/IOStartIOKit.cpp diff --git a/iokit/Kernel/IOStartIOKit.cpp b/iokit/Kernel/IOStartIOKit.cpp index 1245c46ce..25c13cb0e 100644 --- a/iokit/Kernel/IOStartIOKit.cpp +++ b/iokit/Kernel/IOStartIOKit.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2005 Apple Computer, Inc. All rights reserved. + * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved. * * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ * @@ -55,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; @@ -64,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, µsecs); + gIOLastWakeTime.tv_sec = secs; + gIOLastWakeTime.tv_usec = microsecs; +} + + // From <osfmk/kern/debug.c> extern int debug_mode; @@ -185,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" */