xnu-3248.60.10.tar.gz

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

diff --git a/iokit/Kernel/IOStartIOKit.cpp b/iokit/Kernel/IOStartIOKit.cpp
index 787a69bf26679ddd080c2bf68d45b97da7fb7e14..8177603cc2e9042d3b710818ce23a2d440d1aee7 100644 (file)
--- a/iokit/Kernel/IOStartIOKit.cpp
+++ b/iokit/Kernel/IOStartIOKit.cpp
@@ -76,25 +76,12 @@ void IOKitInitializeTime( void )
     clock_initialize_calendar();
 }
 
     clock_initialize_calendar();
 }
 

-void IOKitResetTime( void )
-{
-    clock_sec_t                secs;
-       clock_usec_t    microsecs;
-
-    clock_initialize_calendar();
-
-    clock_get_calendar_microtime(&secs, &microsecs);
-    gIOLastWakeTime.tv_sec  = secs;
-    gIOLastWakeTime.tv_usec = microsecs;
-
-    IOService::updateConsoleUsers(NULL, kIOMessageSystemHasPoweredOn);
-}
-

 void iokit_post_constructor_init(void)
 {
     IORegistryEntry *          root;
     OSObject *                 obj;
 
 void iokit_post_constructor_init(void)
 {
     IORegistryEntry *          root;
     OSObject *                 obj;
 

+    IOCPUInitialize();

     root = IORegistryEntry::initialize();
     assert( root );
     IOService::initialize();
     root = IORegistryEntry::initialize();
     assert( root );
     IOService::initialize();


@@ -135,18 +122,23 @@ void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
     int                                debugFlags;
 
     if( PE_parse_boot_argn( "io", &debugFlags, sizeof (debugFlags) ))
     int                                debugFlags;
 
     if( PE_parse_boot_argn( "io", &debugFlags, sizeof (debugFlags) ))

-               gIOKitDebug = debugFlags;
+       gIOKitDebug = debugFlags;
+#if DEVELOPMENT || DEBUG
+    else gIOKitDebug |= kIOWaitQuietPanics;
+#endif /* DEVELOPMENT || DEBUG */

        
     if( PE_parse_boot_argn( "iotrace", &debugFlags, sizeof (debugFlags) ))
        
     if( PE_parse_boot_argn( "iotrace", &debugFlags, sizeof (debugFlags) ))

-               gIOKitTrace = debugFlags;
+       gIOKitTrace = debugFlags;

        
        

-       // Compat for boot-args
-       gIOKitTrace |= (gIOKitDebug & kIOTraceCompatBootArgs);
+    // Compat for boot-args
+    gIOKitTrace |= (gIOKitDebug & kIOTraceCompatBootArgs);

        
     // Check for the log synchronous bit set in io
     if (gIOKitDebug & kIOLogSynchronous)
         debug_mode = true;
 
        
     // Check for the log synchronous bit set in io
     if (gIOKitDebug & kIOLogSynchronous)
         debug_mode = true;
 

+    if( PE_parse_boot_argn( "pmtimeout", &debugFlags, sizeof (debugFlags) ))
+        gCanSleepTimeout = debugFlags;

     //
     // Have to start IOKit environment before we attempt to start
     // the C++ runtime environment.  At some stage we have to clean up
     //
     // Have to start IOKit environment before we attempt to start
     // the C++ runtime environment.  At some stage we have to clean up