CVS commit: src/sys/arch/sparc64/sparc64

[Takeshi Nakayama]

Module Name:    src
Committed By:   nakayama
Date:           Fri Jul 25 17:54:50 UTC 2014

Modified Files:
        src/sys/arch/sparc64/sparc64: clock.c cpu.c

Log Message:
Use clockfreq() to print a system tick frequency.

The stick-frequency of Fire V100 is 5555555Hz and printing it as
5.555MHz instead of 5MHz is more precise.


To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/sys/arch/sparc64/sparc64/clock.c
cvs rdiff -u -r1.114 -r1.115 src/sys/arch/sparc64/sparc64/cpu.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/sparc64/sparc64/clock.c
diff -u src/sys/arch/sparc64/sparc64/clock.c:1.116 src/sys/arch/sparc64/sparc64/clock.c:1.117
--- src/sys/arch/sparc64/sparc64/clock.c:1.116	Tue Jun 10 18:27:41 2014
+++ src/sys/arch/sparc64/sparc64/clock.c	Fri Jul 25 17:54:50 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.116 2014/06/10 18:27:41 palle Exp $ */
+/*	$NetBSD: clock.c,v 1.117 2014/07/25 17:54:50 nakayama Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.116 2014/06/10 18:27:41 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.117 2014/07/25 17:54:50 nakayama Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -511,16 +511,17 @@ cpu_initclocks(void)
 
 		if (ci->ci_system_clockrate[0] == 0) {
 			aprint_normal("No counter-timer -- using %%tick "
-			    "at %luMHz as system clock.\n",
-			    (unsigned long)ci->ci_cpu_clockrate[1]);
+			    "at %sMHz as system clock.\n",
+			    clockfreq(ci->ci_cpu_clockrate[0]));
 
 			/* We don't have a counter-timer -- use %tick */
 			tickintr_establish(PIL_CLOCK, tickintr);
 		} else if (CPU_ISSUN4U && CPU_IS_HUMMINGBIRD()) {
 #if NPSYCHO > 0
 			aprint_normal("No counter-timer -- using STICK "
-			    "at %luMHz as system clock.\n",
-			    (unsigned long)ci->ci_system_clockrate[1]);
+			    "at %sMHz as system clock.\n",
+			    clockfreq(ci->ci_system_clockrate[0]));
+
 			/* We don't have a counter-timer -- use STICK */
 			stick2eintr_establish(PIL_CLOCK, stick2eintr);
 #else
@@ -528,8 +529,8 @@ cpu_initclocks(void)
 #endif
 		} else {
 			aprint_normal("No counter-timer -- using %%stick "
-			    "at %luMHz as system clock.\n",
-			    (unsigned long)ci->ci_system_clockrate[1]);
+			    "at %sMHz as system clock.\n",
+			    clockfreq(ci->ci_system_clockrate[0]));
 
 			/* We don't have a counter-timer -- use %stick */
 			stickintr_establish(PIL_CLOCK, stickintr);

Index: src/sys/arch/sparc64/sparc64/cpu.c
diff -u src/sys/arch/sparc64/sparc64/cpu.c:1.114 src/sys/arch/sparc64/sparc64/cpu.c:1.115
--- src/sys/arch/sparc64/sparc64/cpu.c:1.114	Fri Jul 25 17:21:32 2014
+++ src/sys/arch/sparc64/sparc64/cpu.c	Fri Jul 25 17:54:50 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.114 2014/07/25 17:21:32 nakayama Exp $ */
+/*	$NetBSD: cpu.c,v 1.115 2014/07/25 17:54:50 nakayama Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.114 2014/07/25 17:21:32 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.115 2014/07/25 17:54:50 nakayama Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -349,8 +349,8 @@ cpu_attach(device_t parent, device_t dev
 	aprint_naive("\n");
 
 	if (ci->ci_system_clockrate[0] != 0) {
-		aprint_normal_dev(dev, "system tick frequency %d MHz\n", 
-		    (int)ci->ci_system_clockrate[1]);
+		aprint_normal_dev(dev, "system tick frequency %s MHz\n",
+		    clockfreq(ci->ci_system_clockrate[0]));
 	}
 	aprint_normal_dev(dev, "");