- add apm to the GENERIC kernel (disabled by default), and add some comments

  regarding apm to LINT
- Disabled the statistics clock on machines which have an APM BIOS and
  have the options "APM_BROKEN_STATCLOCK" enabled (which is default
  in GENERIC now)
- move around some of the code in clock.c dealing with the rtc to make
  it more obvios the effects of disabling the statistics clock

Reviewed by:	bde

3 files changed, 27 insertions, 3 deletions

diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 350cdd7..7239d91 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -1,7 +1,7 @@
 #
 # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks
 #
-#	$Id: GENERIC,v 1.65 1996/04/10 23:03:36 jkh Exp $
+#	$Id: GENERIC,v 1.66 1996/04/18 04:02:30 nate Exp $
 #
 
 machine		"i386"
@@ -92,6 +92,12 @@ device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
 # Mandatory, don't remove
 device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
 
+#
+# Laptop support (see LINT for more options)
+#
+device		apm0    at isa?	disable	# Advanced Power Management
+options		APM_BROKEN_STATCLOCK	# Workaround some buggy APM BIOS
+
 device		sio0	at isa? port "IO_COM1" tty irq 4 vector siointr
 device		sio1	at isa? port "IO_COM2" tty irq 3 vector siointr
 device		sio2	at isa? port "IO_COM3" tty irq 5 vector siointr
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 0eaf65c..7d0e903 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.248 1996/04/03 00:28:40 gpalmer Exp $
+#	$Id: LINT,v 1.249 1996/04/11 06:19:44 scrappy Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -740,6 +740,14 @@ device pca0 at isa? port IO_TIMER1 tty
 # si: Specialix SI/XIO 4-32 port terminal multiplexor
 
 #
+# Notes on APM
+#  Some APM implementations will not work with the `statistics clock'
+#  enabled, so it's disabled by default if the APM driver is enabled.
+#  However, this is not true for all laptops.  Try removing the option
+#  APM_BROKEN_STATCLOCK and see if suspend/resume work
+#
+
+#
 # Notes on the spigot:
 #  The video spigot is at 0xad6.  This port address can not be changed.
 #  The irq values may only be 10, 11, or 15
@@ -775,6 +783,7 @@ device		ctx0	at isa? port 0x230 iomem 0xd0000
 device		spigot0 at isa? port 0xad6 irq 15 iomem 0xee000 vector spigintr
 device		qcam0	at isa? port "IO_LPT3" tty
 device		apm0	at isa?
+options		APM_BROKEN_STATCLOCK
 device		gp0	at isa? port 0x2c0 tty
 device		gsc0	at isa? port "IO_GSC1" tty drq 3
 device		joy0	at isa? port "IO_GAME"
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 0eaf65c..7d0e903 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.248 1996/04/03 00:28:40 gpalmer Exp $
+#	$Id: LINT,v 1.249 1996/04/11 06:19:44 scrappy Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -740,6 +740,14 @@ device pca0 at isa? port IO_TIMER1 tty
 # si: Specialix SI/XIO 4-32 port terminal multiplexor
 
 #
+# Notes on APM
+#  Some APM implementations will not work with the `statistics clock'
+#  enabled, so it's disabled by default if the APM driver is enabled.
+#  However, this is not true for all laptops.  Try removing the option
+#  APM_BROKEN_STATCLOCK and see if suspend/resume work
+#
+
+#
 # Notes on the spigot:
 #  The video spigot is at 0xad6.  This port address can not be changed.
 #  The irq values may only be 10, 11, or 15
@@ -775,6 +783,7 @@ device		ctx0	at isa? port 0x230 iomem 0xd0000
 device		spigot0 at isa? port 0xad6 irq 15 iomem 0xee000 vector spigintr
 device		qcam0	at isa? port "IO_LPT3" tty
 device		apm0	at isa?
+options		APM_BROKEN_STATCLOCK
 device		gp0	at isa? port 0x2c0 tty
 device		gsc0	at isa? port "IO_GSC1" tty drq 3
 device		joy0	at isa? port "IO_GAME"