diff options
| author | pst <pst@FreeBSD.org> | 1996-06-11 16:11:27 +0000 |
|---|---|---|
| committer | pst <pst@FreeBSD.org> | 1996-06-11 16:11:27 +0000 |
| commit | fac3b958bc4812d1b5a5f9cc95a767b94a896947 (patch) | |
| tree | a8afd1322f88c7322e6b753a49bc4619fe8e677e /sys/amd64 | |
| parent | 05dc2e0edfbeb4a68aecf3da1381caa39a3dc426 (diff) | |
| download | FreeBSD-src-fac3b958bc4812d1b5a5f9cc95a767b94a896947.zip FreeBSD-src-fac3b958bc4812d1b5a5f9cc95a767b94a896947.tar.gz | |
Move warning messages under bootverbose
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/tsc.c | 12 | ||||
| -rw-r--r-- | sys/amd64/isa/clock.c | 12 |
2 files changed, 16 insertions, 8 deletions
diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c index fb8427d..21b9e36 100644 --- a/sys/amd64/amd64/tsc.c +++ b/sys/amd64/amd64/tsc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.58 1996/05/01 08:39:02 bde Exp $ + * $Id: clock.c,v 1.59 1996/06/11 16:02:55 pst Exp $ */ /* @@ -423,7 +423,7 @@ calibrate_clocks(void) u_int count, prev_count, tot_count; int sec, start_sec, timeout; - printf("Calibrating clock(s) relative to mc146818A clock ... "); + printf("Calibrating clock(s) relative to mc146818A clock...\n"); if (!(rtcin(RTC_STATUSD) & RTCSD_PWR)) goto fail; timeout = 100000000; @@ -562,7 +562,8 @@ startrtclock() delta = freq > timer_freq ? freq - timer_freq : timer_freq - freq; if (delta < timer_freq / 100) { #ifndef CLK_USE_I8254_CALIBRATION - printf( + if (bootverbose) + printf( "CLK_USE_I8254_CALIBRATION not specified - using default frequency\n"); freq = timer_freq; #endif @@ -581,7 +582,8 @@ startrtclock() #if defined(I586_CPU) || defined(I686_CPU) #ifndef CLK_USE_I586_CALIBRATION if (i586_ctr_rate != 0) { - printf( + if (bootverbose) + printf( "CLK_USE_I586_CALIBRATION not specified - using old calibration method\n"); i586_ctr_freq = 0; i586_ctr_rate = 0; @@ -600,7 +602,9 @@ startrtclock() DELAY(1000000); i586_count = rdtsc(); i586_ctr_rate = (i586_count << I586_CTR_RATE_SHIFT) / 1000000; +#ifdef CLK_USE_I586_CALIBRATION printf("i586 clock: %u Hz\n", i586_ctr_freq); +#endif } #endif } diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c index fb8427d..21b9e36 100644 --- a/sys/amd64/isa/clock.c +++ b/sys/amd64/isa/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.58 1996/05/01 08:39:02 bde Exp $ + * $Id: clock.c,v 1.59 1996/06/11 16:02:55 pst Exp $ */ /* @@ -423,7 +423,7 @@ calibrate_clocks(void) u_int count, prev_count, tot_count; int sec, start_sec, timeout; - printf("Calibrating clock(s) relative to mc146818A clock ... "); + printf("Calibrating clock(s) relative to mc146818A clock...\n"); if (!(rtcin(RTC_STATUSD) & RTCSD_PWR)) goto fail; timeout = 100000000; @@ -562,7 +562,8 @@ startrtclock() delta = freq > timer_freq ? freq - timer_freq : timer_freq - freq; if (delta < timer_freq / 100) { #ifndef CLK_USE_I8254_CALIBRATION - printf( + if (bootverbose) + printf( "CLK_USE_I8254_CALIBRATION not specified - using default frequency\n"); freq = timer_freq; #endif @@ -581,7 +582,8 @@ startrtclock() #if defined(I586_CPU) || defined(I686_CPU) #ifndef CLK_USE_I586_CALIBRATION if (i586_ctr_rate != 0) { - printf( + if (bootverbose) + printf( "CLK_USE_I586_CALIBRATION not specified - using old calibration method\n"); i586_ctr_freq = 0; i586_ctr_rate = 0; @@ -600,7 +602,9 @@ startrtclock() DELAY(1000000); i586_count = rdtsc(); i586_ctr_rate = (i586_count << I586_CTR_RATE_SHIFT) / 1000000; +#ifdef CLK_USE_I586_CALIBRATION printf("i586 clock: %u Hz\n", i586_ctr_freq); +#endif } #endif } |
