diff options
author | gpalmer <gpalmer@FreeBSD.org> | 1997-03-05 00:54:00 +0000 |
---|---|---|
committer | gpalmer <gpalmer@FreeBSD.org> | 1997-03-05 00:54:00 +0000 |
commit | 5d25456e482ebdc22cd737ff6542b59b33672ce0 (patch) | |
tree | a7de4c623bbe600d61db54a42bcb8cff51b59016 | |
parent | 227366adfea45ac84897ecb14f0855a0ccd603b3 (diff) | |
download | FreeBSD-src-5d25456e482ebdc22cd737ff6542b59b33672ce0.zip FreeBSD-src-5d25456e482ebdc22cd737ff6542b59b33672ce0.tar.gz |
Back out the patch to break up the clock probe lines. Instead, follow
Bruce's suggestion of deleting "relative to mc146818A clock ",
thus shortening the line ...
-rw-r--r-- | sys/amd64/amd64/tsc.c | 8 | ||||
-rw-r--r-- | sys/amd64/isa/clock.c | 8 | ||||
-rw-r--r-- | sys/i386/i386/tsc.c | 8 | ||||
-rw-r--r-- | sys/i386/isa/clock.c | 8 | ||||
-rw-r--r-- | sys/isa/atrtc.c | 8 |
5 files changed, 20 insertions, 20 deletions
diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c index 09ba1e5..a63ec9e 100644 --- a/sys/amd64/amd64/tsc.c +++ b/sys/amd64/amd64/tsc.c @@ -514,7 +514,7 @@ calibrate_clocks(void) u_int count, prev_count, tot_count; int sec, start_sec, timeout; - printf("Calibrating clock(s) relative to mc146818A clock.\n"); + printf("Calibrating clock(s) ... "); if (!(rtcin(RTC_STATUSD) & RTCSD_PWR)) goto fail; timeout = 100000000; @@ -587,15 +587,15 @@ 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,\n", i586_ctr_freq); + printf("i586 clock: %u Hz, ", i586_ctr_freq); } #endif - printf(" i8254 clock: %u Hz\n", tot_count); + printf("i8254 clock: %u Hz\n", tot_count); return (tot_count); fail: - printf(" Failed, using default i8254 clock of %u Hz\n", timer_freq); + printf("failed, using default i8254 clock of %u Hz\n", timer_freq); return (timer_freq); } diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c index 09ba1e5..a63ec9e 100644 --- a/sys/amd64/isa/clock.c +++ b/sys/amd64/isa/clock.c @@ -514,7 +514,7 @@ calibrate_clocks(void) u_int count, prev_count, tot_count; int sec, start_sec, timeout; - printf("Calibrating clock(s) relative to mc146818A clock.\n"); + printf("Calibrating clock(s) ... "); if (!(rtcin(RTC_STATUSD) & RTCSD_PWR)) goto fail; timeout = 100000000; @@ -587,15 +587,15 @@ 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,\n", i586_ctr_freq); + printf("i586 clock: %u Hz, ", i586_ctr_freq); } #endif - printf(" i8254 clock: %u Hz\n", tot_count); + printf("i8254 clock: %u Hz\n", tot_count); return (tot_count); fail: - printf(" Failed, using default i8254 clock of %u Hz\n", timer_freq); + printf("failed, using default i8254 clock of %u Hz\n", timer_freq); return (timer_freq); } diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c index 09ba1e5..a63ec9e 100644 --- a/sys/i386/i386/tsc.c +++ b/sys/i386/i386/tsc.c @@ -514,7 +514,7 @@ calibrate_clocks(void) u_int count, prev_count, tot_count; int sec, start_sec, timeout; - printf("Calibrating clock(s) relative to mc146818A clock.\n"); + printf("Calibrating clock(s) ... "); if (!(rtcin(RTC_STATUSD) & RTCSD_PWR)) goto fail; timeout = 100000000; @@ -587,15 +587,15 @@ 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,\n", i586_ctr_freq); + printf("i586 clock: %u Hz, ", i586_ctr_freq); } #endif - printf(" i8254 clock: %u Hz\n", tot_count); + printf("i8254 clock: %u Hz\n", tot_count); return (tot_count); fail: - printf(" Failed, using default i8254 clock of %u Hz\n", timer_freq); + printf("failed, using default i8254 clock of %u Hz\n", timer_freq); return (timer_freq); } diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c index 09ba1e5..a63ec9e 100644 --- a/sys/i386/isa/clock.c +++ b/sys/i386/isa/clock.c @@ -514,7 +514,7 @@ calibrate_clocks(void) u_int count, prev_count, tot_count; int sec, start_sec, timeout; - printf("Calibrating clock(s) relative to mc146818A clock.\n"); + printf("Calibrating clock(s) ... "); if (!(rtcin(RTC_STATUSD) & RTCSD_PWR)) goto fail; timeout = 100000000; @@ -587,15 +587,15 @@ 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,\n", i586_ctr_freq); + printf("i586 clock: %u Hz, ", i586_ctr_freq); } #endif - printf(" i8254 clock: %u Hz\n", tot_count); + printf("i8254 clock: %u Hz\n", tot_count); return (tot_count); fail: - printf(" Failed, using default i8254 clock of %u Hz\n", timer_freq); + printf("failed, using default i8254 clock of %u Hz\n", timer_freq); return (timer_freq); } diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c index 09ba1e5..a63ec9e 100644 --- a/sys/isa/atrtc.c +++ b/sys/isa/atrtc.c @@ -514,7 +514,7 @@ calibrate_clocks(void) u_int count, prev_count, tot_count; int sec, start_sec, timeout; - printf("Calibrating clock(s) relative to mc146818A clock.\n"); + printf("Calibrating clock(s) ... "); if (!(rtcin(RTC_STATUSD) & RTCSD_PWR)) goto fail; timeout = 100000000; @@ -587,15 +587,15 @@ 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,\n", i586_ctr_freq); + printf("i586 clock: %u Hz, ", i586_ctr_freq); } #endif - printf(" i8254 clock: %u Hz\n", tot_count); + printf("i8254 clock: %u Hz\n", tot_count); return (tot_count); fail: - printf(" Failed, using default i8254 clock of %u Hz\n", timer_freq); + printf("failed, using default i8254 clock of %u Hz\n", timer_freq); return (timer_freq); } |