From 3e35beccf8dfdf1b5aa9fa620a513144243a7b16 Mon Sep 17 00:00:00 2001 From: kato Date: Fri, 4 Aug 2000 08:15:45 +0000 Subject: Merged from sys/i386/isa/clock.c revision 1.155. --- sys/pc98/cbus/clock.c | 7 ++++++- sys/pc98/cbus/pcrtc.c | 7 ++++++- sys/pc98/pc98/clock.c | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) (limited to 'sys') diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c index b0e63bb..bb12753 100644 --- a/sys/pc98/cbus/clock.c +++ b/sys/pc98/cbus/clock.c @@ -1011,7 +1011,12 @@ startrtclock() * 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. */ - return; + { + int disabled = 0; + resource_int_value("apm", 0, "disabled", &disabled); + if (disabled == 0) + 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 b0e63bb..bb12753 100644 --- a/sys/pc98/cbus/pcrtc.c +++ b/sys/pc98/cbus/pcrtc.c @@ -1011,7 +1011,12 @@ startrtclock() * 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. */ - return; + { + int disabled = 0; + resource_int_value("apm", 0, "disabled", &disabled); + if (disabled == 0) + 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 b0e63bb..bb12753 100644 --- a/sys/pc98/pc98/clock.c +++ b/sys/pc98/pc98/clock.c @@ -1011,7 +1011,12 @@ startrtclock() * 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. */ - return; + { + int disabled = 0; + resource_int_value("apm", 0, "disabled", &disabled); + if (disabled == 0) + return; + } #endif /* NAPM > 0 */ if (tsc_present && tsc_freq != 0 && !tsc_is_broken) { -- cgit v1.1