mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-11-16 15:44:04 +01:00
Synchronize with sys/i386/isa/clock.c revision 1.79.
This commit is contained in:
KATO Takenori
parent
bdca44f670
commit
85c57124b2
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=23407
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user