Loading...
--- xnu/xnu-4570.41.2/iokit/Kernel/IOStartIOKit.cpp
+++ xnu/xnu-2050.9.2/iokit/Kernel/IOStartIOKit.cpp
@@ -42,24 +42,16 @@
#include <IOKit/pwr_mgt/IOPMinformeeList.h>
#include <IOKit/IOStatisticsPrivate.h>
#include <IOKit/IOKitKeysPrivate.h>
-#include <IOKit/IOInterruptAccountingPrivate.h>
+
#include <IOKit/assert.h>
-#include <sys/conf.h>
#include "IOKitKernelInternal.h"
-const OSSymbol * gIOProgressBackbufferKey;
-OSSet * gIORemoveOnReadProperties;
-
extern "C" {
-
-void StartIOKit( void * p1, void * p2, void * p3, void * p4 );
-void IORegistrySetOSBuildVersion(char * build_version);
-void IORecordProgressBackbuffer(void * buffer, size_t size, uint32_t theme);
extern void OSlibkernInit (void);
-void iokit_post_constructor_init(void);
+void iokit_post_constructor_init(void) __attribute__((section("__TEXT, initcode")));
#include <kern/clock.h>
#include <sys/time.h>
@@ -77,7 +69,21 @@
IOService::resourceMatching("IONVRAM"), &t );
#endif
- 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, µsecs);
+ gIOLastWakeTime.tv_sec = secs;
+ gIOLastWakeTime.tv_usec = microsecs;
+
+ IOService::updateConsoleUsers(NULL, kIOMessageSystemHasPoweredOn);
}
void iokit_post_constructor_init(void)
@@ -85,7 +91,6 @@
IORegistryEntry * root;
OSObject * obj;
- IOCPUInitialize();
root = IORegistryEntry::initialize();
assert( root );
IOService::initialize();
@@ -112,6 +117,9 @@
}
}
+// From <osfmk/kern/debug.c>
+extern int debug_mode;
+
/*****
* Pointer into bootstrap KLD segment for functions never used past startup.
*/
@@ -123,19 +131,18 @@
int debugFlags;
if( PE_parse_boot_argn( "io", &debugFlags, sizeof (debugFlags) ))
- gIOKitDebug = debugFlags;
-#if DEVELOPMENT || DEBUG
- else gIOKitDebug |= kIOWaitQuietPanics;
-#endif /* DEVELOPMENT || DEBUG */
+ gIOKitDebug = 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);
- if( PE_parse_boot_argn( "pmtimeout", &debugFlags, sizeof (debugFlags) ))
- gCanSleepTimeout = debugFlags;
+ // 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
@@ -145,12 +152,6 @@
//
IOLibInit();
OSlibkernInit();
- devsw_init();
-
- gIOProgressBackbufferKey = OSSymbol::withCStringNoCopy(kIOProgressBackbufferKey);
- gIORemoveOnReadProperties = OSSet::withObjects((const OSObject **) &gIOProgressBackbufferKey, 1);
-
- interruptAccountingInit();
rootNub = new IOPlatformExpertDevice;
@@ -193,17 +194,4 @@
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" */