Loading...
--- xnu/xnu-3248.50.21/iokit/Kernel/IOStartIOKit.cpp
+++ xnu/xnu-2422.1.72/iokit/Kernel/IOStartIOKit.cpp
@@ -42,14 +42,10 @@
#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"
-
-const OSSymbol * gIOProgressBackbufferKey;
-OSSet * gIORemoveOnReadProperties;
extern "C" {
@@ -76,12 +72,25 @@
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)
{
IORegistryEntry * root;
OSObject * obj;
- IOCPUInitialize();
root = IORegistryEntry::initialize();
assert( root );
IOService::initialize();
@@ -122,23 +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);
// 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
@@ -148,11 +152,6 @@
//
IOLibInit();
OSlibkernInit();
-
- gIOProgressBackbufferKey = OSSymbol::withCStringNoCopy(kIOProgressBackbufferKey);
- gIORemoveOnReadProperties = OSSet::withObjects((const OSObject **) &gIOProgressBackbufferKey, 1);
-
- interruptAccountingInit();
rootNub = new IOPlatformExpertDevice;
@@ -195,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" */