xnu-3789.41.3.tar.gz

[apple/xnu.git] / pexpert / i386 / pe_identify_machine.c

diff --git a/pexpert/i386/pe_identify_machine.c b/pexpert/i386/pe_identify_machine.c
index a7982f703f887dc658dc7c91e34e96c3ea6624bc..a632a7ae7acc75e688b80d42e57f45d869d22724 100644 (file)
--- a/pexpert/i386/pe_identify_machine.c
+++ b/pexpert/i386/pe_identify_machine.c
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_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. 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. 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.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -20,14 +23,11 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
+#include <machine/machine_routines.h>
 #include <pexpert/pexpert.h>
 #include <pexpert/protos.h>
-#include <pexpert/device_tree.h>
-
-/* External declarations */
-unsigned int LockTimeOut = 1250000000; /* XXX - Need real value for i386 */
 
 /* Local declarations */
 void pe_identify_machine(boot_args *args);
@@ -37,15 +37,15 @@ void pe_identify_machine(boot_args *args);
  *   Sets up platform parameters.
  *   Returns:    nothing
  */
-void pe_identify_machine(boot_args *args)
+void pe_identify_machine(__unused boot_args *args)
 {
   // Clear the gPEClockFrequencyInfo struct
   bzero((void *)&gPEClockFrequencyInfo, sizeof(clock_frequency_info_t));
   
   // Start with default values.
-  gPEClockFrequencyInfo.timebase_frequency_hz =  25000000;
-  gPEClockFrequencyInfo.bus_frequency_hz      = 100000000;
-  gPEClockFrequencyInfo.cpu_frequency_hz      = 300000000;
+  gPEClockFrequencyInfo.timebase_frequency_hz = 1000000000;
+  gPEClockFrequencyInfo.bus_frequency_hz      =  100000000;
+  gPEClockFrequencyInfo.cpu_frequency_hz      =  300000000;
   
   gPEClockFrequencyInfo.bus_frequency_min_hz = gPEClockFrequencyInfo.bus_frequency_hz;
   gPEClockFrequencyInfo.bus_frequency_max_hz = gPEClockFrequencyInfo.bus_frequency_hz;