Convert apm from a bogus 'count' into a plain option. Clean out some

other cruft from the files.alpha and files.ia64 that were related to this.

16 files changed, 34 insertions, 40 deletions

diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c
index aafa821..b34567b 100644
--- a/sys/amd64/amd64/tsc.c
+++ b/sys/amd64/amd64/tsc.c
@@ -49,7 +49,7 @@
  */
 
 #include "opt_clock.h"
-#include "apm.h"
+#include "opt_apm.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -796,7 +796,7 @@ startrtclock()
 	 * Curse Intel for leaving the counter out of the I/O APIC.
 	 */
 
-#if NAPM > 0
+#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 
@@ -813,7 +813,7 @@ startrtclock()
 	if (disabled == 0)
 		return;
 	}
-#endif /* NAPM > 0 */
+#endif /* DEV_APM */
 
 	if (tsc_present && tsc_freq != 0 && !tsc_is_broken) {
 		tsc_timecounter.tc_frequency = tsc_freq;
diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c
index aafa821..b34567b 100644
--- a/sys/amd64/isa/clock.c
+++ b/sys/amd64/isa/clock.c
@@ -49,7 +49,7 @@
  */
 
 #include "opt_clock.h"
-#include "apm.h"
+#include "opt_apm.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -796,7 +796,7 @@ startrtclock()
 	 * Curse Intel for leaving the counter out of the I/O APIC.
 	 */
 
-#if NAPM > 0
+#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 
@@ -813,7 +813,7 @@ startrtclock()
 	if (disabled == 0)
 		return;
 	}
-#endif /* NAPM > 0 */
+#endif /* DEV_APM */
 
 	if (tsc_present && tsc_freq != 0 && !tsc_is_broken) {
 		tsc_timecounter.tc_frequency = tsc_freq;
diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha
index 553c3cb..505824f 100644
--- a/sys/conf/files.alpha
+++ b/sys/conf/files.alpha
@@ -24,10 +24,6 @@ font8x16.o			optional	std8x16font		\
 	compile-with	"uudecode < /usr/share/syscons/fonts/${STD8X16FONT}-8x16.fnt && file2c 'unsigned char font_16[16*256] = {' '};' < ${STD8X16FONT}-8x16 > font8x16.c && ${CC} -c ${CFLAGS} font8x16.c"				\
 	no-implicit-rule before-depend					\
 	clean		"${STD8X16FONT}-8x16 font8x16.c"
-# make sure apm.h gets made correctly
-apm.h				standard				\
-	compile-with		"echo '#define NAPM 0' > apm.h"		\
-	no-obj no-implicit-rule before-depend
 #
 atkbdmap.h			optional	atkbd_dflt_keymap	\
 	compile-with	"/usr/sbin/kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h"			\
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index a9540eb..ad5a724 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -147,7 +147,7 @@ gnu/i386/fpemul/reg_u_mul.s	optional	gpl_math_emulate
 gnu/i386/fpemul/reg_u_sub.s	optional	gpl_math_emulate
 gnu/i386/fpemul/wm_shrx.s	optional	gpl_math_emulate
 gnu/i386/fpemul/wm_sqrt.s	optional	gpl_math_emulate
-i386/apm/apm.c			count		apm
+i386/apm/apm.c			optional	apm
 i386/i386/atomic.c		standard				\
 	compile-with	"${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}"
 i386/i386/autoconf.c		standard
diff --git a/sys/conf/files.ia64 b/sys/conf/files.ia64
index de03a66..dc5505c 100644
--- a/sys/conf/files.ia64
+++ b/sys/conf/files.ia64
@@ -12,10 +12,6 @@ font8x16.o			optional	std8x16font		\
 	compile-with	"uudecode < /usr/share/syscons/fonts/${STD8X16FONT}-8x16.fnt && file2c 'unsigned char font_16[16*256] = {' '};' < ${STD8X16FONT}-8x16 > font8x16.c && ${CC} -c ${CFLAGS} font8x16.c"				\
 	no-implicit-rule before-depend					\
 	clean		"${STD8X16FONT}-8x16 font8x16.c"
-# make sure apm.h gets made correctly
-apm.h				standard				\
-	compile-with		"echo '#define NAPM 0' > apm.h"		\
-	no-obj no-implicit-rule before-depend
 #
 atkbdmap.h			optional	atkbd_dflt_keymap	\
 	compile-with	"/usr/sbin/kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h"			\
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index 8e34481..e1f2b06 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -140,7 +140,7 @@ gnu/i386/fpemul/reg_u_mul.s	optional	gpl_math_emulate
 gnu/i386/fpemul/reg_u_sub.s	optional	gpl_math_emulate
 gnu/i386/fpemul/wm_shrx.s	optional	gpl_math_emulate
 gnu/i386/fpemul/wm_sqrt.s	optional	gpl_math_emulate
-i386/apm/apm.c			count		apm
+i386/apm/apm.c			optional	apm
 i386/i386/atomic.c		standard				\
 	compile-with	"${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}"
 i386/i386/autoconf.c		standard
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 5b63914..6d55187 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -193,8 +193,9 @@ OLTR_NO_BULLSEYE_MAC	opt_oltr.h
 # Defaults to NDGB*16.
 NDGBPORTS		opt_dgb.h
 
-# NPX options
+# Device options
 DEV_NPX			opt_npx.h
+DEV_APM			opt_apm.h
 
 # -------------------------------
 # EOF
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index 43d5d82..e6be8b0 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -196,8 +196,9 @@ EPSON_BOUNCEDMA		opt_pc98.h
 EPSON_MEMWIN		opt_pc98.h
 LINE30			opt_syscons.h
 
-# NPX options
+# Device options
 DEV_NPX			opt_npx.h
+DEV_APM			opt_apm.h
 
 # -------------------------------
 # EOF
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index a1137ff..84f1cbe 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -32,7 +32,7 @@
 #include "opt_syscons.h"
 #include "opt_ddb.h"
 #ifdef __i386__
-#include "apm.h"
+#include "opt_apm.h"
 #endif
 
 #include <sys/param.h>
@@ -3115,7 +3115,7 @@ next_code:
 #endif
 		break;
 
-#if NAPM > 0
+#ifdef DEV_APM
 	    case SUSP:
 		apm_suspend(PMST_SUSPEND);
 		break;
diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c
index aafa821..b34567b 100644
--- a/sys/i386/i386/tsc.c
+++ b/sys/i386/i386/tsc.c
@@ -49,7 +49,7 @@
  */
 
 #include "opt_clock.h"
-#include "apm.h"
+#include "opt_apm.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -796,7 +796,7 @@ startrtclock()
 	 * Curse Intel for leaving the counter out of the I/O APIC.
 	 */
 
-#if NAPM > 0
+#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 
@@ -813,7 +813,7 @@ startrtclock()
 	if (disabled == 0)
 		return;
 	}
-#endif /* NAPM > 0 */
+#endif /* DEV_APM */
 
 	if (tsc_present && tsc_freq != 0 && !tsc_is_broken) {
 		tsc_timecounter.tc_frequency = tsc_freq;
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index aafa821..b34567b 100644
--- a/sys/i386/isa/clock.c
+++ b/sys/i386/isa/clock.c
@@ -49,7 +49,7 @@
  */
 
 #include "opt_clock.h"
-#include "apm.h"
+#include "opt_apm.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -796,7 +796,7 @@ startrtclock()
 	 * Curse Intel for leaving the counter out of the I/O APIC.
 	 */
 
-#if NAPM > 0
+#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 
@@ -813,7 +813,7 @@ startrtclock()
 	if (disabled == 0)
 		return;
 	}
-#endif /* NAPM > 0 */
+#endif /* DEV_APM */
 
 	if (tsc_present && tsc_freq != 0 && !tsc_is_broken) {
 		tsc_timecounter.tc_frequency = tsc_freq;
diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c
index aafa821..b34567b 100644
--- a/sys/isa/atrtc.c
+++ b/sys/isa/atrtc.c
@@ -49,7 +49,7 @@
  */
 
 #include "opt_clock.h"
-#include "apm.h"
+#include "opt_apm.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -796,7 +796,7 @@ startrtclock()
 	 * Curse Intel for leaving the counter out of the I/O APIC.
 	 */
 
-#if NAPM > 0
+#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 
@@ -813,7 +813,7 @@ startrtclock()
 	if (disabled == 0)
 		return;
 	}
-#endif /* NAPM > 0 */
+#endif /* DEV_APM */
 
 	if (tsc_present && tsc_freq != 0 && !tsc_is_broken) {
 		tsc_timecounter.tc_frequency = tsc_freq;
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c
index 303f38a..3acf9a4 100644
--- a/sys/pc98/cbus/clock.c
+++ b/sys/pc98/cbus/clock.c
@@ -53,7 +53,7 @@
  */
 
 #include "opt_clock.h"
-#include "apm.h"
+#include "opt_apm.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -988,7 +988,7 @@ startrtclock()
 	 * Curse Intel for leaving the counter out of the I/O APIC.
 	 */
 
-#if NAPM > 0
+#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 
@@ -1005,7 +1005,7 @@ startrtclock()
 	if (disabled == 0)
 		return;
 	}
-#endif /* NAPM > 0 */
+#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 303f38a..3acf9a4 100644
--- a/sys/pc98/cbus/pcrtc.c
+++ b/sys/pc98/cbus/pcrtc.c
@@ -53,7 +53,7 @@
  */
 
 #include "opt_clock.h"
-#include "apm.h"
+#include "opt_apm.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -988,7 +988,7 @@ startrtclock()
 	 * Curse Intel for leaving the counter out of the I/O APIC.
 	 */
 
-#if NAPM > 0
+#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 
@@ -1005,7 +1005,7 @@ startrtclock()
 	if (disabled == 0)
 		return;
 	}
-#endif /* NAPM > 0 */
+#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 303f38a..3acf9a4 100644
--- a/sys/pc98/pc98/clock.c
+++ b/sys/pc98/pc98/clock.c
@@ -53,7 +53,7 @@
  */
 
 #include "opt_clock.h"
-#include "apm.h"
+#include "opt_apm.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -988,7 +988,7 @@ startrtclock()
 	 * Curse Intel for leaving the counter out of the I/O APIC.
 	 */
 
-#if NAPM > 0
+#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 
@@ -1005,7 +1005,7 @@ startrtclock()
 	if (disabled == 0)
 		return;
 	}
-#endif /* NAPM > 0 */
+#endif /* DEV_APM */
 
 	if (tsc_present && tsc_freq != 0 && !tsc_is_broken) {
 		tsc_timecounter.tc_frequency = tsc_freq;
diff --git a/sys/pc98/pc98/syscons.c b/sys/pc98/pc98/syscons.c
index 554432d..adb0e7c 100644
--- a/sys/pc98/pc98/syscons.c
+++ b/sys/pc98/pc98/syscons.c
@@ -32,7 +32,7 @@
 #include "opt_syscons.h"
 #include "opt_ddb.h"
 #ifdef __i386__
-#include "apm.h"
+#include "opt_apm.h"
 #endif
 
 #include <sys/param.h>
@@ -3134,7 +3134,7 @@ next_code:
 #endif
 		break;
 
-#if NAPM > 0
+#ifdef DEV_APM
 	    case SUSP:
 		apm_suspend(PMST_SUSPEND);
 		break;