xnu-2782.20.48.tar.gz

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

diff --git a/iokit/Kernel/IOStartIOKit.cpp b/iokit/Kernel/IOStartIOKit.cpp
index 7b70541d6486089b04e756e859add89749f4cc52..787a69bf26679ddd080c2bf68d45b97da7fb7e14 100644 (file)
--- a/iokit/Kernel/IOStartIOKit.cpp
+++ b/iokit/Kernel/IOStartIOKit.cpp
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 1998-2011 Apple Inc. All rights reserved.
+ * Copyright (c) 1998-2010 Apple Inc. All rights reserved.

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


@@ -38,17 +38,24 @@
 #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/RootDomain.h>

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

+#include <IOKit/IOStatisticsPrivate.h>
+#include <IOKit/IOKitKeysPrivate.h>
+#include <IOKit/IOInterruptAccountingPrivate.h>

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

+const OSSymbol * gIOProgressBackbufferKey;
+OSSet *          gIORemoveOnReadProperties;
+

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

-void iokit_post_constructor_init(void) __attribute__((section("__TEXT, initcode")));
+void iokit_post_constructor_init(void);

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


@@ -61,7 +68,7 @@ void IOKitInitializeTime( void )
        t.tv_nsec = 0;
        IOService::waitForService(
                IOService::resourceMatching("IORTC"), &t );
        t.tv_nsec = 0;
        IOService::waitForService(
                IOService::resourceMatching("IORTC"), &t );

-#ifdef ppc
+#if defined(__i386__) || defined(__x86_64__)

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


@@ -79,6 +86,8 @@ void IOKitResetTime( void )
     clock_get_calendar_microtime(&secs, &microsecs);
     gIOLastWakeTime.tv_sec  = secs;
     gIOLastWakeTime.tv_usec = microsecs;
     clock_get_calendar_microtime(&secs, &microsecs);
     gIOLastWakeTime.tv_sec  = secs;
     gIOLastWakeTime.tv_usec = microsecs;

+
+    IOService::updateConsoleUsers(NULL, kIOMessageSystemHasPoweredOn);

 }
 
 void iokit_post_constructor_init(void)
 }
 
 void iokit_post_constructor_init(void)


@@ -90,8 +99,11 @@ void iokit_post_constructor_init(void)
     assert( root );
     IOService::initialize();
     IOCatalogue::initialize();
     assert( root );
     IOService::initialize();
     IOCatalogue::initialize();

+    IOStatistics::initialize();
+    OSKext::initialize();

     IOUserClient::initialize();
     IOMemoryDescriptor::initialize();
     IOUserClient::initialize();
     IOMemoryDescriptor::initialize();

+    IORootParent::initialize();

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


@@ -107,7 +119,6 @@ void iokit_post_constructor_init(void)
         root->setProperty( kIOKitDiagnosticsKey, obj );
        obj->release();
     }
         root->setProperty( kIOKitDiagnosticsKey, obj );
        obj->release();
     }

-

 }
 
 // From <osfmk/kern/debug.c>
 }
 
 // From <osfmk/kern/debug.c>


@@ -122,24 +133,20 @@ void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
 {
     IOPlatformExpertDevice *   rootNub;
     int                                debugFlags;
 {
     IOPlatformExpertDevice *   rootNub;
     int                                debugFlags;

-       uint32_t                intThreshold;

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

-       gIOKitDebug = debugFlags;
-
+               gIOKitDebug = debugFlags;
+       

     if( PE_parse_boot_argn( "iotrace", &debugFlags, sizeof (debugFlags) ))
                gIOKitTrace = debugFlags;
        
        // Compat for boot-args
        gIOKitTrace |= (gIOKitDebug & kIOTraceCompatBootArgs);
     if( PE_parse_boot_argn( "iotrace", &debugFlags, sizeof (debugFlags) ))
                gIOKitTrace = debugFlags;
        
        // Compat for boot-args
        gIOKitTrace |= (gIOKitDebug & kIOTraceCompatBootArgs);

-
-    if( PE_parse_boot_argn( "iointthreshold", &intThreshold, sizeof (intThreshold) ))
-               gIOInterruptThresholdNS = intThreshold * 1000;

        
     // 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;

-       
+

     //
     // 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


@@ -150,6 +157,11 @@ void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
     IOLibInit(); 
     OSlibkernInit();
 
     IOLibInit(); 
     OSlibkernInit();
 

+    gIOProgressBackbufferKey  = OSSymbol::withCStringNoCopy(kIOProgressBackbufferKey);
+    gIORemoveOnReadProperties = OSSet::withObjects((const OSObject **) &gIOProgressBackbufferKey, 1);
+
+    interruptAccountingInit();
+

     rootNub = new IOPlatformExpertDevice;
 
     if( rootNub && rootNub->initWithArgs( p1, p2, p3, p4)) {
     rootNub = new IOPlatformExpertDevice;
 
     if( rootNub && rootNub->initWithArgs( p1, p2, p3, p4)) {


@@ -191,4 +203,17 @@ IORegistrySetOSBuildVersion(char * build_version)
     return;
 }
 
     return;
 }
 

+void
+IORecordProgressBackbuffer(void * buffer, size_t size, uint32_t theme)
+{
+    IORegistryEntry * chosen;
+    if ((chosen = IORegistryEntry::fromPath(kIODeviceTreePlane ":/chosen")))
+    {
+        chosen->setProperty(kIOProgressBackbufferKey, buffer, size);
+       chosen->setProperty(kIOProgressColorThemeKey, theme, 32);
+
+        chosen->release();
+    }
+}
+

 }; /* extern "C" */
 }; /* extern "C" */