Loading...
--- xnu/xnu-2050.22.13/iokit/Kernel/IOStartIOKit.cpp
+++ xnu/xnu-1504.7.4/iokit/Kernel/IOStartIOKit.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2010 Apple Inc. All rights reserved.
+ * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
@@ -25,6 +25,12 @@
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
+/*
+ * Copyright (c) 1998,1999 Apple Inc. All rights reserved.
+ *
+ * HISTORY
+ *
+ */
#include <libkern/c++/OSUnserialize.h>
#include <libkern/c++/OSKext.h>
@@ -38,10 +44,7 @@
#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/IOStatisticsPrivate.h>
-#include <IOKit/IOKitKeysPrivate.h>
#include <IOKit/assert.h>
@@ -64,7 +67,7 @@
t.tv_nsec = 0;
IOService::waitForService(
IOService::resourceMatching("IORTC"), &t );
-#if defined(__i386__) || defined(__x86_64__)
+#ifdef ppc
IOService::waitForService(
IOService::resourceMatching("IONVRAM"), &t );
#endif
@@ -82,8 +85,6 @@
clock_get_calendar_microtime(&secs, µsecs);
gIOLastWakeTime.tv_sec = secs;
gIOLastWakeTime.tv_usec = microsecs;
-
- IOService::updateConsoleUsers(NULL, kIOMessageSystemHasPoweredOn);
}
void iokit_post_constructor_init(void)
@@ -95,11 +96,8 @@
assert( root );
IOService::initialize();
IOCatalogue::initialize();
- IOStatistics::initialize();
- OSKext::initialize();
IOUserClient::initialize();
IOMemoryDescriptor::initialize();
- IORootParent::initialize();
// Initializes IOPMinformeeList class-wide shared lock
IOPMinformeeList::getSharedRecursiveLock();
@@ -115,6 +113,7 @@
root->setProperty( kIOKitDiagnosticsKey, obj );
obj->release();
}
+
}
// From <osfmk/kern/debug.c>
@@ -131,14 +130,8 @@
int debugFlags;
if( PE_parse_boot_argn( "io", &debugFlags, sizeof (debugFlags) ))
- gIOKitDebug = debugFlags;
-
- if( PE_parse_boot_argn( "iotrace", &debugFlags, sizeof (debugFlags) ))
- gIOKitTrace = debugFlags;
-
- // Compat for boot-args
- gIOKitTrace |= (gIOKitDebug & kIOTraceCompatBootArgs);
-
+ gIOKitDebug = debugFlags;
+
// Check for the log synchronous bit set in io
if (gIOKitDebug & kIOLogSynchronous)
debug_mode = true;