Module Name: src
Committed By: martin
Date: Thu Jan 8 11:15:45 UTC 2015
Modified Files:
src/sys/arch/x86/x86 [netbsd-7]: intel_busclock.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #393):
sys/arch/x86/x86/intel_busclock.c: revision 1.20
- Round off some bus clock values.
- Add 333.33MHz for Pentium 4.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.2.1 src/sys/arch/x86/x86/intel_busclock.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/intel_busclock.c
diff -u src/sys/arch/x86/x86/intel_busclock.c:1.19 src/sys/arch/x86/x86/intel_busclock.c:1.19.2.1
--- src/sys/arch/x86/x86/intel_busclock.c:1.19 Fri Jul 25 14:34:22 2014
+++ src/sys/arch/x86/x86/intel_busclock.c Thu Jan 8 11:15:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_busclock.c,v 1.19 2014/07/25 14:34:22 msaitoh Exp $ */
+/* $NetBSD: intel_busclock.c,v 1.19.2.1 2015/01/08 11:15:45 martin Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_busclock.c,v 1.19 2014/07/25 14:34:22 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_busclock.c,v 1.19.2.1 2015/01/08 11:15:45 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -316,7 +316,7 @@ p4_get_bus_clock(struct cpu_info *ci)
switch (bus) {
case 0:
bus_clock = (CPUID_TO_MODEL(ci->ci_signature) == 2) ?
- 10000 : 26666;
+ 10000 : 26667;
break;
case 1:
bus_clock = 13333;
@@ -325,7 +325,10 @@ p4_get_bus_clock(struct cpu_info *ci)
bus_clock = 20000;
break;
case 3:
- bus_clock = 16666;
+ bus_clock = 16667;
+ break;
+ case 4:
+ bus_clock = 33333;
break;
default:
aprint_debug("%s: unknown Pentium 4 (model %d) "
