diff options
| author | kato <kato@FreeBSD.org> | 1997-03-05 16:19:48 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1997-03-05 16:19:48 +0000 |
| commit | 21d274a9e5f58240d0339d2a091af79af02d84e8 (patch) | |
| tree | 0c56da9a6523fd3272710f0eb9dad50d05054a35 /sys/pc98/cbus | |
| parent | 6334056b87abd02a5e712c67e20720dfdf9045f4 (diff) | |
| download | FreeBSD-src-21d274a9e5f58240d0339d2a091af79af02d84e8.zip FreeBSD-src-21d274a9e5f58240d0339d2a091af79af02d84e8.tar.gz | |
Synchronize with sys/i386/isa/clock.c revision 1.79.
Diffstat (limited to 'sys/pc98/cbus')
| -rw-r--r-- | sys/pc98/cbus/clock.c | 24 | ||||
| -rw-r--r-- | sys/pc98/cbus/pcrtc.c | 24 |
2 files changed, 32 insertions, 16 deletions
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c index 02d11fa..699858f 100644 --- a/sys/pc98/cbus/clock.c +++ b/sys/pc98/cbus/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id$ + * $Id: clock.c,v 1.17 1997/02/22 09:43:32 peter Exp $ */ /* @@ -655,7 +655,8 @@ calibrate_clocks(void) u_int count, prev_count, tot_count; int sec, start_sec, timeout; - printf("Calibrating clock(s) relative to mc146818A clock ... "); + if (bootverbose) + printf("Calibrating clock(s) ... "); if (!(rtcin(RTC_STATUSD) & RTCSD_PWR)) goto fail; timeout = 100000000; @@ -728,15 +729,19 @@ calibrate_clocks(void) */ if (cpu_class == CPUCLASS_586 || cpu_class == CPUCLASS_686) { set_i586_ctr_freq((u_int)rdtsc(), tot_count); - printf("i586 clock: %u Hz, ", i586_ctr_freq); + if (bootverbose) + printf("i586 clock: %u Hz, ", i586_ctr_freq); } #endif - printf("i8254 clock: %u Hz\n", tot_count); + if (bootverbose) + printf("i8254 clock: %u Hz\n", tot_count); return (tot_count); fail: - printf("failed, using default i8254 clock of %u Hz\n", timer_freq); + if (bootverbose) + printf("failed, using default i8254 clock of %u Hz\n", + timer_freq); return (timer_freq); } #endif /* !PC98 */ @@ -818,8 +823,10 @@ startrtclock() #endif timer_freq = freq; } else { - printf("%d Hz differs from default of %d Hz by more than 1%%\n", - freq, timer_freq); + if (bootverbose) + printf( + "%d Hz differs from default of %d Hz by more than 1%%\n", + freq, timer_freq); #if defined(I586_CPU) || defined(I686_CPU) i586_ctr_freq = 0; #endif @@ -848,7 +855,8 @@ startrtclock() DELAY(1000000); set_i586_ctr_freq((u_int)rdtsc(), timer_freq); #ifdef CLK_USE_I586_CALIBRATION - printf("i586 clock: %u Hz\n", i586_ctr_freq); + if (bootverbose) + printf("i586 clock: %u Hz\n", i586_ctr_freq); #endif } #endif diff --git a/sys/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c index 02d11fa..699858f 100644 --- a/sys/pc98/cbus/pcrtc.c +++ b/sys/pc98/cbus/pcrtc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id$ + * $Id: clock.c,v 1.17 1997/02/22 09:43:32 peter Exp $ */ /* @@ -655,7 +655,8 @@ calibrate_clocks(void) u_int count, prev_count, tot_count; int sec, start_sec, timeout; - printf("Calibrating clock(s) relative to mc146818A clock ... "); + if (bootverbose) + printf("Calibrating clock(s) ... "); if (!(rtcin(RTC_STATUSD) & RTCSD_PWR)) goto fail; timeout = 100000000; @@ -728,15 +729,19 @@ calibrate_clocks(void) */ if (cpu_class == CPUCLASS_586 || cpu_class == CPUCLASS_686) { set_i586_ctr_freq((u_int)rdtsc(), tot_count); - printf("i586 clock: %u Hz, ", i586_ctr_freq); + if (bootverbose) + printf("i586 clock: %u Hz, ", i586_ctr_freq); } #endif - printf("i8254 clock: %u Hz\n", tot_count); + if (bootverbose) + printf("i8254 clock: %u Hz\n", tot_count); return (tot_count); fail: - printf("failed, using default i8254 clock of %u Hz\n", timer_freq); + if (bootverbose) + printf("failed, using default i8254 clock of %u Hz\n", + timer_freq); return (timer_freq); } #endif /* !PC98 */ @@ -818,8 +823,10 @@ startrtclock() #endif timer_freq = freq; } else { - printf("%d Hz differs from default of %d Hz by more than 1%%\n", - freq, timer_freq); + if (bootverbose) + printf( + "%d Hz differs from default of %d Hz by more than 1%%\n", + freq, timer_freq); #if defined(I586_CPU) || defined(I686_CPU) i586_ctr_freq = 0; #endif @@ -848,7 +855,8 @@ startrtclock() DELAY(1000000); set_i586_ctr_freq((u_int)rdtsc(), timer_freq); #ifdef CLK_USE_I586_CALIBRATION - printf("i586 clock: %u Hz\n", i586_ctr_freq); + if (bootverbose) + printf("i586 clock: %u Hz\n", i586_ctr_freq); #endif } #endif |
