Loading...
--- xnu/xnu-1228/iokit/Kernel/IOStartIOKit.cpp
+++ xnu/xnu-124.7/iokit/Kernel/IOStartIOKit.cpp
@@ -1,29 +1,23 @@
/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_HEADER_START@
*
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License"). You may not use this file except in compliance with the
+ * License. Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
*
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- *
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@
*/
/*
* Copyright (c) 1998,1999 Apple Computer, Inc. All rights reserved.
@@ -33,7 +27,6 @@
*/
#include <libkern/c++/OSUnserialize.h>
-#include <libkern/version.h>
#include <IOKit/IORegistryEntry.h>
#include <IOKit/IODeviceTreeSupport.h>
#include <IOKit/IOCatalogue.h>
@@ -43,50 +36,35 @@
#include <IOKit/IOLib.h>
#include <IOKit/IOKitKeys.h>
#include <IOKit/IOKitDebug.h>
-#include <IOKit/pwr_mgt/IOPMinformeeList.h>
+#include <IOKit/network/IONetworkController.h>
+#include <IOKit/graphics/IODisplay.h>
#include <IOKit/assert.h>
-
-#include "IOKitKernelInternal.h"
extern "C" {
extern void OSlibkernInit (void);
-extern void ml_hpet_cfg(uint32_t, uint32_t);
+extern void IOLibInit(void);
#include <kern/clock.h>
-#include <sys/time.h>
-void IOKitInitializeTime( void )
+
+void IOKitResetTime( void )
{
- mach_timespec_t t;
+ mach_timespec_t t;
- t.tv_sec = 30;
- t.tv_nsec = 0;
- IOService::waitForService(
- IOService::resourceMatching("IORTC"), &t );
-#ifdef ppc
- IOService::waitForService(
- IOService::resourceMatching("IONVRAM"), &t );
+ t.tv_sec = 30;
+ t.tv_nsec = 0;
+ IOService::waitForService(
+ IOService::resourceMatching("IORTC"), &t );
+#ifndef i386
+ IOService::waitForService(
+ IOService::resourceMatching("IONVRAM"), &t );
#endif
clock_initialize_calendar();
}
-void IOKitResetTime( void )
-{
- uint32_t secs, microsecs;
-
- clock_initialize_calendar();
-
- clock_get_calendar_microtime(&secs, µsecs);
- gIOLastWakeTime.tv_sec = secs;
- gIOLastWakeTime.tv_usec = microsecs;
-}
-
-
-// From <osfmk/kern/debug.c>
-extern int debug_mode;
void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
{
@@ -100,13 +78,10 @@
OSCollectionIterator * kmodIter; // must release
OSString * kmodName; // don't release
+ IOLog( iokit_version );
+
if( PE_parse_boot_arg( "io", &debugFlags ))
gIOKitDebug = 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
@@ -116,6 +91,9 @@
//
IOLibInit();
OSlibkernInit();
+
+ IOLog("_cppInit done\n");
+
/*****
* Declare the fake kmod_info structs for built-in components
@@ -147,13 +125,8 @@
"an invalid version.\n",
kmodName->getCStringNoCopy());
}
-
- // empty version strings get replaced with current kernel version
- const char *vers = (strlen(kmodVersion->getCStringNoCopy())
- ? kmodVersion->getCStringNoCopy()
- : osrelease);
-
- if (KERN_SUCCESS != kmod_create_fake(kmodName->getCStringNoCopy(), vers)) {
+ if (KERN_SUCCESS != kmod_create_fake(kmodName->getCStringNoCopy(),
+ kmodVersion->getCStringNoCopy())) {
panic("Failure declaring in-kernel kmod \"%s\".\n",
kmodName->getCStringNoCopy());
}
@@ -170,11 +143,10 @@
IOCatalogue::initialize();
IOUserClient::initialize();
IOMemoryDescriptor::initialize();
+ IONetworkController::initialize();
+ IODisplay::initialize();
- // Initializes IOPMinformeeList class-wide shared lock
- IOPMinformeeList::getSharedRecursiveLock();
-
- obj = OSString::withCString( version );
+ obj = OSString::withCString( iokit_version );
assert( obj );
if( obj ) {
root->setProperty( kIOKitBuildVersionKey, obj );
@@ -185,6 +157,11 @@
root->setProperty( kIOKitDiagnosticsKey, obj );
obj->release();
}
+
+#ifdef i386
+ // pretend there's no device-tree for intel
+ p1 = 0;
+#endif
rootNub = new IOPlatformExpertDevice;
@@ -197,32 +174,7 @@
gIOCatalogue->recordStartupExtensions();
rootNub->registerService();
-
-#if !NO_KEXTD
- /* Add a busy count to keep the registry busy until kextd has
- * completely finished launching. This is decremented when kextd
- * messages the kernel after the in-kernel linker has been
- * removed and personalities have been sent.
- */
- IOService::getServiceRoot()->adjustBusy(1);
-#endif
}
}
-void
-IORegistrySetOSBuildVersion(char * build_version)
-{
- IORegistryEntry * root = IORegistryEntry::getRegistryRoot();
-
- if (root) {
- if (build_version) {
- root->setProperty(kOSBuildVersionKey, build_version);
- } else {
- root->removeProperty(kOSBuildVersionKey);
- }
- }
-
- return;
-}
-
}; /* extern "C" */