Loading...
--- xnu/xnu-792.21.3/iokit/Kernel/IOStartIOKit.cpp
+++ xnu/xnu-517/iokit/Kernel/IOStartIOKit.cpp
@@ -1,19 +1,16 @@
/*
* Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
*
* 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.
- *
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * compliance with the License. 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
@@ -23,7 +20,7 @@
* 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 +30,6 @@
*/
#include <libkern/c++/OSUnserialize.h>
-#include <libkern/version.h>
#include <IOKit/IORegistryEntry.h>
#include <IOKit/IODeviceTreeSupport.h>
#include <IOKit/IOCatalogue.h>
@@ -46,11 +42,10 @@
#include <IOKit/assert.h>
-#include "IOKitKernelInternal.h"
-
extern "C" {
extern void OSlibkernInit (void);
+extern void IOLibInit(void);
#include <kern/clock.h>
@@ -84,6 +79,8 @@
OSDictionary * fakeKmods; // must release
OSCollectionIterator * kmodIter; // must release
OSString * kmodName; // don't release
+
+ IOLog( iokit_version );
if( PE_parse_boot_arg( "io", &debugFlags ))
gIOKitDebug = debugFlags;
@@ -132,13 +129,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());
}
@@ -156,7 +148,7 @@
IOUserClient::initialize();
IOMemoryDescriptor::initialize();
- obj = OSString::withCString( version );
+ obj = OSString::withCString( iokit_version );
assert( obj );
if( obj ) {
root->setProperty( kIOKitBuildVersionKey, obj );