--- xnu/xnu-792.25.20/iokit/KernelConfigTables.cpp
+++ xnu/xnu-344.49/iokit/KernelConfigTables.cpp
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * 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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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. 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -23,53 +26,90 @@
 
 /* This list is used in IOStartIOKit.cpp to declare fake kmod_info
  * structs for kext dependencies that are built into the kernel.
- * Empty version strings get replaced with osrelease at runtime.
+ * See the SystemKEXT project for fuller information on these
+ * fake or pseudo-kexts, including their compatible versions.
  */
 const char * gIOKernelKmods =
-"{"
-   "'com.apple.kernel'                         = '';"
-   "'com.apple.kpi.bsd'                        = '';"
-   "'com.apple.kpi.iokit'                      = '';"
-   "'com.apple.kpi.libkern'                    = '';"
-   "'com.apple.kpi.mach'                       = '';"
-   "'com.apple.kpi.unsupported'                = '';"
-   "'com.apple.iokit.IONVRAMFamily'            = '';"
-   "'com.apple.driver.AppleNMI'                = '';"
-   "'com.apple.iokit.IOSystemManagementFamily' = '';"
-   "'com.apple.iokit.ApplePlatformFamily'      = '';"
-   "'com.apple.kernel.6.0'                     = '7.9.9';"
-   "'com.apple.kernel.bsd'                     = '7.9.9';"
-   "'com.apple.kernel.iokit'                   = '7.9.9';"
-   "'com.apple.kernel.libkern'                 = '7.9.9';"
-   "'com.apple.kernel.mach'                    = '7.9.9';"
-"}";
+"{
+    'com.apple.kernel'                         = '6.8';
+    'com.apple.kernel.bsd'                     = '6.8';
+    'com.apple.kernel.iokit'                   = '6.8';
+    'com.apple.kernel.libkern'                 = '6.8';
+    'com.apple.kernel.mach'                    = '6.8';
+    'com.apple.iokit.IOADBFamily'              = '6.8';
+    'com.apple.iokit.IONVRAMFamily'            = '6.8';
+    'com.apple.iokit.IOSystemManagementFamily' = '6.8';
+    'com.apple.iokit.ApplePlatformFamily'      = '6.8';
+    'com.apple.driver.AppleNMI'                = '6.8';
+}";
 
 
 const char * gIOKernelConfigTables =
-"("
-"   {"
-"     'IOClass'         = IOPanicPlatform;"
-"     'IOProviderClass' = IOPlatformExpertDevice;"
-"     'IOProbeScore'    = '-1';"
-"   }"
+"(
+    {
+      'IOClass'         = IOPanicPlatform;
+      'IOProviderClass' = IOPlatformExpertDevice;
+      'IOProbeScore'    = '-1';
+    }
+"
 #ifdef PPC
-"   ,"
-"   {"
-"       'IOClass'               = AppleCPU;"
-"       'IOProviderClass'       = IOPlatformDevice;"
-"       'IONameMatch'           = 'cpu';"
-"       'IOProbeScore'          = 100:32;"
-"   },"
-"   {"
-"       'IOClass'              = AppleNMI;"
-"       'IOProviderClass'      = AppleMacIODevice;"
-"       'IONameMatch'          = 'programmer-switch';"
-"   },"
-"   {"
-"       'IOClass'               = AppleNVRAM;"
-"       'IOProviderClass'       = AppleMacIODevice;"
-"       'IONameMatch'           = nvram;"
-"   }"
+"   ,
+    {
+	'IOClass'		= AppleCPU;
+	'IOProviderClass'	= IOPlatformDevice;
+        'IONameMatch'		= 'cpu';
+	'IOProbeScore'		= 100:32;
+    },
+    {
+        'IOClass'              = AppleNMI;
+        'IOProviderClass'      = AppleMacIODevice;
+        'IONameMatch'          = 'programmer-switch';
+    },
+    {
+        'IOClass'		= AppleNVRAM;
+        'IOProviderClass'	= AppleMacIODevice;
+        'IONameMatch'		= nvram;
+    }, 
+    {   
+        'IOClass'               = IOPMUADBController;
+        'IOProviderClass'       = AppleMacIODevice;
+        'IONameMatch'           = adb;
+    }
+"
 #endif /* PPC */
+#ifdef i386
+"   ,
+    {
+       'IOClass'           = AppleI386PlatformExpert;
+       'IOProviderClass'   = IOPlatformExpertDevice;
+       'top-level'         = "
+    /* set of dicts to make into nubs */
+    "[
+       { IOName = cpu; },
+       { IOName = intel-pic; },
+       { IOName = intel-clock; }, 
+       { IOName = ps2controller; },
+       { IOName = pci; },
+       { IOName = display; 'AAPL,boot-display' = Yes; }
+    ];
+    },
+    {
+       'IOClass'           = AppleI386CPU;
+       'IOProviderClass'   = IOPlatformDevice;
+       'IONameMatch'       = cpu;
+       'IOProbeScore'      = 100:32;
+    },
+    {
+       'IOClass'           = AppleIntelClassicPIC;
+       'IOProviderClass'   = IOPlatformDevice;
+       'IONameMatch'       = intel-pic;
+    },
+    {
+       'IOClass'           = AppleIntelClock;
+       'IOProviderClass'   = IOPlatformDevice;
+       'IONameMatch'       = intel-clock;
+    }
+"
+#endif /* i386 */
 ")";