xnu-344.49.tar.gz

[apple/xnu.git] / pexpert / ppc / pe_clock_speed.c

diff --git a/pexpert/ppc/pe_clock_speed.c b/pexpert/ppc/pe_clock_speed.c
index 61f6c8dffd7a4dcab73bdc91aa79b92f07d79f28..92a9d8d87408765545fb1b97d4e264b59741962a 100644 (file)
--- a/pexpert/ppc/pe_clock_speed.c
+++ b/pexpert/ppc/pe_clock_speed.c
@@ -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,7 +26,7 @@
  *  pe_clock_speed.c - Determine the best guess for the processor and bus
  *                     speed buy using the values returned by run_clock_test.
  *
- *  (c) Apple Computer, Inc. 1998-2000
+ *  (c) Apple Computer, Inc. 1998-2002
  *
  *  Writen by:   Josh de Cesare
  *
@@ -81,10 +84,22 @@ void PE_Determine_Clock_Speeds(unsigned int via_addr, int num_speeds,
   gPEClockFrequencyInfo.bus_to_dec_rate_num = 1;
   gPEClockFrequencyInfo.bus_to_dec_rate_den = 4;
   
+  // Assume that the timebase frequency is derived from the bus clock.
+  gPEClockFrequencyInfo.timebase_frequency_num = bus_freq_num;
+  gPEClockFrequencyInfo.timebase_frequency_den = bus_freq_den * 4;
+  
   // Set the truncated numbers in gPEClockFrequencyInfo.
   gPEClockFrequencyInfo.bus_clock_rate_hz = tmp_bus_speed;
   gPEClockFrequencyInfo.cpu_clock_rate_hz = tmp_cpu_speed;
   gPEClockFrequencyInfo.dec_clock_rate_hz = tmp_bus_speed / 4;
+  gPEClockFrequencyInfo.timebase_frequency_hz = tmp_bus_speed / 4;
+  
+  gPEClockFrequencyInfo.bus_frequency_hz = tmp_bus_speed;
+  gPEClockFrequencyInfo.bus_frequency_min_hz = tmp_bus_speed;
+  gPEClockFrequencyInfo.bus_frequency_max_hz = tmp_bus_speed;
+  gPEClockFrequencyInfo.cpu_frequency_hz = tmp_cpu_speed;
+  gPEClockFrequencyInfo.cpu_frequency_min_hz = tmp_cpu_speed;
+  gPEClockFrequencyInfo.cpu_frequency_max_hz = tmp_cpu_speed;
   
   PE_call_timebase_callback();
 }