From 72e13bfb97c2ffb44e84a3c667447833b2a09e81 Mon Sep 17 00:00:00 2001
From: Yoshihiro Takahashi <nyan@FreeBSD.org>
Date: Sat, 22 Dec 2001 01:35:44 +0000
Subject: [PATCH] MFi386: revision 1.178

---
 sys/pc98/cbus/clock.c | 11 ++++-------
 sys/pc98/cbus/pcrtc.c | 11 ++++-------
 sys/pc98/pc98/clock.c | 11 ++++-------
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c
index 54bf0f86b9b..38bc8d51144 100644
--- a/sys/pc98/cbus/clock.c
+++ b/sys/pc98/cbus/clock.c
@@ -53,7 +53,6 @@
  */
 
 #include "opt_clock.h"
-#include "opt_apm.h"
 #include "opt_mca.h"
 
 #include <sys/param.h>
@@ -67,6 +66,7 @@
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/cons.h>
+#include <sys/power.h>
 
 #include <machine/clock.h>
 #ifdef CLK_CALIBRATION_LOOP
@@ -1019,7 +1019,6 @@ startrtclock()
 	 * Curse Intel for leaving the counter out of the I/O APIC.
 	 */
 
-#ifdef DEV_APM
 	/*
 	 * We can not use the TSC if we support APM. Precise timekeeping
 	 * on an APM'ed machine is at best a fools pursuit, since 
@@ -1030,13 +1029,11 @@ 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.
 	 */
-	{
-	int disabled = 0;
-	resource_int_value("apm", 0, "disabled", &disabled);
-	if (disabled == 0)
+	if (power_pm_get_type() == POWER_PM_TYPE_APM) {
+		if (bootverbose)
+			printf("TSC initialization skipped: APM enabled.\n");
 		return;
 	}
-#endif /* DEV_APM */
 
 	if (tsc_present && tsc_freq != 0 && !tsc_is_broken) {
 		tsc_timecounter.tc_frequency = tsc_freq;
diff --git a/sys/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c
index 54bf0f86b9b..38bc8d51144 100644
--- a/sys/pc98/cbus/pcrtc.c
+++ b/sys/pc98/cbus/pcrtc.c
@@ -53,7 +53,6 @@
  */
 
 #include "opt_clock.h"
-#include "opt_apm.h"
 #include "opt_mca.h"
 
 #include <sys/param.h>
@@ -67,6 +66,7 @@
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/cons.h>
+#include <sys/power.h>
 
 #include <machine/clock.h>
 #ifdef CLK_CALIBRATION_LOOP
@@ -1019,7 +1019,6 @@ startrtclock()
 	 * Curse Intel for leaving the counter out of the I/O APIC.
 	 */
 
-#ifdef DEV_APM
 	/*
 	 * We can not use the TSC if we support APM. Precise timekeeping
 	 * on an APM'ed machine is at best a fools pursuit, since 
@@ -1030,13 +1029,11 @@ 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.
 	 */
-	{
-	int disabled = 0;
-	resource_int_value("apm", 0, "disabled", &disabled);
-	if (disabled == 0)
+	if (power_pm_get_type() == POWER_PM_TYPE_APM) {
+		if (bootverbose)
+			printf("TSC initialization skipped: APM enabled.\n");
 		return;
 	}
-#endif /* DEV_APM */
 
 	if (tsc_present && tsc_freq != 0 && !tsc_is_broken) {
 		tsc_timecounter.tc_frequency = tsc_freq;
diff --git a/sys/pc98/pc98/clock.c b/sys/pc98/pc98/clock.c
index 54bf0f86b9b..38bc8d51144 100644
--- a/sys/pc98/pc98/clock.c
+++ b/sys/pc98/pc98/clock.c
@@ -53,7 +53,6 @@
  */
 
 #include "opt_clock.h"
-#include "opt_apm.h"
 #include "opt_mca.h"
 
 #include <sys/param.h>
@@ -67,6 +66,7 @@
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/cons.h>
+#include <sys/power.h>
 
 #include <machine/clock.h>
 #ifdef CLK_CALIBRATION_LOOP
@@ -1019,7 +1019,6 @@ startrtclock()
 	 * Curse Intel for leaving the counter out of the I/O APIC.
 	 */
 
-#ifdef DEV_APM
 	/*
 	 * We can not use the TSC if we support APM. Precise timekeeping
 	 * on an APM'ed machine is at best a fools pursuit, since 
@@ -1030,13 +1029,11 @@ 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.
 	 */
-	{
-	int disabled = 0;
-	resource_int_value("apm", 0, "disabled", &disabled);
-	if (disabled == 0)
+	if (power_pm_get_type() == POWER_PM_TYPE_APM) {
+		if (bootverbose)
+			printf("TSC initialization skipped: APM enabled.\n");
 		return;
 	}
-#endif /* DEV_APM */
 
 	if (tsc_present && tsc_freq != 0 && !tsc_is_broken) {
 		tsc_timecounter.tc_frequency = tsc_freq;