d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Back out the patch to break up the clock probe lines. Instead, follow

Browse Source 
Bruce's suggestion of deleting "relative to mc146818A clock ",
thus shortening the line ...
This commit is contained in:
Gary Palmer 1997-03-05 00:54:00 +00:00
parent 624ff93821
commit 0b146b65d2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=23386
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/amd64/amd64/tsc.c
View File

@ -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);
}

8
sys/amd64/isa/clock.c
View File

@ -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);
}

8
sys/i386/i386/tsc.c
View File

@ -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);
}

8
sys/i386/isa/clock.c
View File

@ -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);
}

8
sys/isa/atrtc.c
View File

@ -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);
}