diff options
| -rw-r--r-- | sys/pc98/cbus/clock.c | 17 | ||||
| -rw-r--r-- | sys/pc98/cbus/pcrtc.c | 17 | ||||
| -rw-r--r-- | sys/pc98/pc98/clock.c | 17 |
3 files changed, 18 insertions, 33 deletions
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c index a72826bbcf20..4676b7467790 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: clock.c,v 1.72 1999/06/28 13:11:16 kato Exp $ + * $Id: clock.c,v 1.73 1999/07/26 12:21:09 kato Exp $ */ /* @@ -74,10 +74,6 @@ #include <machine/limits.h> #include <machine/md_var.h> #include <machine/psl.h> -#if NAPM > 0 -#include <machine/apm_bios.h> -#include <i386/apm/apm_setup.h> -#endif #ifdef APIC_IO #include <machine/segments.h> #endif @@ -964,17 +960,16 @@ startrtclock() #if NAPM > 0 /* - * We can not use the TSC if we found an APM bios. Too many - * of them lie about their ability&intention to fiddle the CPU - * clock for us to rely on this. Precise timekeeping on an - * APM'ed machine is at best a fools pursuit anyway, since + * We can not use the TSC if we support APM. Precise timekeeping + * on an APM'ed machine is at best a fools pursuit, since * any and all of the time spent in various SMM code can't * be reliably accounted for. Reading the RTC is your only * source of reliable time info. The i8254 looses too of course * but we need to have some kind of time... + * We don't know at this point whether APM is going to be used + * or not, nor when it might be activated. Play it safe. */ - if (apm_version != APMINI_CANTFIND) - return; + return; #endif /* NAPM > 0 */ if (tsc_present && tsc_freq != 0 && !tsc_is_broken) { diff --git a/sys/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c index a72826bbcf20..4676b7467790 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: clock.c,v 1.72 1999/06/28 13:11:16 kato Exp $ + * $Id: clock.c,v 1.73 1999/07/26 12:21:09 kato Exp $ */ /* @@ -74,10 +74,6 @@ #include <machine/limits.h> #include <machine/md_var.h> #include <machine/psl.h> -#if NAPM > 0 -#include <machine/apm_bios.h> -#include <i386/apm/apm_setup.h> -#endif #ifdef APIC_IO #include <machine/segments.h> #endif @@ -964,17 +960,16 @@ startrtclock() #if NAPM > 0 /* - * We can not use the TSC if we found an APM bios. Too many - * of them lie about their ability&intention to fiddle the CPU - * clock for us to rely on this. Precise timekeeping on an - * APM'ed machine is at best a fools pursuit anyway, since + * We can not use the TSC if we support APM. Precise timekeeping + * on an APM'ed machine is at best a fools pursuit, since * any and all of the time spent in various SMM code can't * be reliably accounted for. Reading the RTC is your only * source of reliable time info. The i8254 looses too of course * but we need to have some kind of time... + * We don't know at this point whether APM is going to be used + * or not, nor when it might be activated. Play it safe. */ - if (apm_version != APMINI_CANTFIND) - return; + return; #endif /* NAPM > 0 */ if (tsc_present && tsc_freq != 0 && !tsc_is_broken) { diff --git a/sys/pc98/pc98/clock.c b/sys/pc98/pc98/clock.c index a72826bbcf20..4676b7467790 100644 --- a/sys/pc98/pc98/clock.c +++ b/sys/pc98/pc98/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.72 1999/06/28 13:11:16 kato Exp $ + * $Id: clock.c,v 1.73 1999/07/26 12:21:09 kato Exp $ */ /* @@ -74,10 +74,6 @@ #include <machine/limits.h> #include <machine/md_var.h> #include <machine/psl.h> -#if NAPM > 0 -#include <machine/apm_bios.h> -#include <i386/apm/apm_setup.h> -#endif #ifdef APIC_IO #include <machine/segments.h> #endif @@ -964,17 +960,16 @@ startrtclock() #if NAPM > 0 /* - * We can not use the TSC if we found an APM bios. Too many - * of them lie about their ability&intention to fiddle the CPU - * clock for us to rely on this. Precise timekeeping on an - * APM'ed machine is at best a fools pursuit anyway, since + * We can not use the TSC if we support APM. Precise timekeeping + * on an APM'ed machine is at best a fools pursuit, since * any and all of the time spent in various SMM code can't * be reliably accounted for. Reading the RTC is your only * source of reliable time info. The i8254 looses too of course * but we need to have some kind of time... + * We don't know at this point whether APM is going to be used + * or not, nor when it might be activated. Play it safe. */ - if (apm_version != APMINI_CANTFIND) - return; + return; #endif /* NAPM > 0 */ if (tsc_present && tsc_freq != 0 && !tsc_is_broken) { |