Shoot the LKM support in the old wd/wdc/atapi driver set in the head and

perform a cleanup/unifdef sweep over it to tidy things up.  The atapi
code is permanently attached to the wd driver and is always probed.

I will add an extra option bit in the flags to disable an atapi probe on
either the master or slave if needed, if people want this.

Remember, this driver is destined to die some time.  It's possible that
it will loose all atapi support down the track and only be used for
dumb non-ATA disks and all ata/atapi devices will be handled by the new
ata system.

ATAPI, ATAPI_STATIC and CMD640 are no longer options, all are implicit.

Previously discussed with:  sos

5 files changed, 6 insertions, 42 deletions

diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 7ea722f..1d3e4f5 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.156 1999/03/29 17:56:27 ken Exp $
+#	$Id: GENERIC,v 1.157 1999/04/11 20:53:50 n_hibma Exp $
 
 machine		"i386"
 cpu		"I386_CPU"
@@ -60,7 +60,6 @@ controller	fdc0	at isa? port "IO_FD1" bio irq 6 drq 2
 disk		fd0	at fdc0 drive 0
 disk		fd1	at fdc0 drive 1
 
-options		"CMD640"	# work around CMD640 chip deficiency
 controller	wdc0	at isa? port "IO_WD1" bio irq 14
 disk		wd0	at wdc0 drive 0
 disk		wd1	at wdc0 drive 1
@@ -69,8 +68,6 @@ controller	wdc1	at isa? port "IO_WD2" bio irq 15
 disk		wd2	at wdc1 drive 0
 disk		wd3	at wdc1 drive 1
 
-options		ATAPI		#Enable ATAPI support for IDE bus
-options		ATAPI_STATIC	#Don't do it as an LKM
 device		wcd0		#IDE CD-ROM
 device		wfd0		#IDE Floppy (e.g. LS-120)
 
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index d3161fd..17bf557 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.578 1999/04/11 20:53:50 n_hibma Exp $
+#	$Id: LINT,v 1.579 1999/04/12 09:45:29 brian 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
@@ -1091,20 +1091,6 @@ disk		wd2	at wdc1 drive 0
 disk		wd3	at wdc1 drive 1
 
 #
-# Options for `wdc':
-#
-# CMD640 enables serializing access to primary and secondary channel
-# of the CMD640B IDE Chip. The serializing will only take place
-# if this option is set *and* the chip is probed by the pci-system.
-#
-options         "CMD640"	#Enable work around for CMD640 h/w bug
-#
-# ATAPI enables the support for ATAPI-compatible IDE devices
-#
-options         ATAPI   #Enable ATAPI support for IDE bus
-options		ATAPI_STATIC	#Don't do it as an LKM
-
-#
 # This option allow you to override the default probe time for IDE
 # devices, to get a faster probe.  Setting this below 10000 violate
 # the IDE specs, but may still work for you (it will work for most
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index d3161fd..17bf557 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.578 1999/04/11 20:53:50 n_hibma Exp $
+#	$Id: LINT,v 1.579 1999/04/12 09:45:29 brian 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
@@ -1091,20 +1091,6 @@ disk		wd2	at wdc1 drive 0
 disk		wd3	at wdc1 drive 1
 
 #
-# Options for `wdc':
-#
-# CMD640 enables serializing access to primary and secondary channel
-# of the CMD640B IDE Chip. The serializing will only take place
-# if this option is set *and* the chip is probed by the pci-system.
-#
-options         "CMD640"	#Enable work around for CMD640 h/w bug
-#
-# ATAPI enables the support for ATAPI-compatible IDE devices
-#
-options         ATAPI   #Enable ATAPI support for IDE bus
-options		ATAPI_STATIC	#Don't do it as an LKM
-
-#
 # This option allow you to override the default probe time for IDE
 # devices, to get a faster probe.  Setting this below 10000 violate
 # the IDE specs, but may still work for you (it will work for most
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index 6d359f3..76a745f 100644
--- a/sys/i386/conf/files.i386
+++ b/sys/i386/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.232 1999/03/30 21:32:43 eivind Exp $
+#	$Id: files.i386,v 1.233 1999/04/07 03:55:36 msmith Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -273,7 +273,7 @@ i386/isa/vga_isa.c		optional	vga	device-driver
 i386/isa/tw.c			optional	tw	device-driver
 i386/isa/wd.c			optional	wdc	device-driver
 i386/isa/wd.c			optional	wd	device-driver
-i386/isa/atapi.c		optional	atapi	device-driver
+i386/isa/atapi.c		optional	wdc	device-driver
 i386/isa/atapi-cd.c		optional	wcd	device-driver
 i386/isa/wfd.c			optional	wfd	device-driver
 i386/isa/wst.c			optional	wst	device-driver
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index 840fa55..4f63652 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.109 1999/03/10 10:36:30 yokota Exp $
+#	$Id: options.i386,v 1.110 1999/03/13 13:20:59 joerg Exp $
 
 DISABLE_PSE
 IDE_DELAY
@@ -99,11 +99,6 @@ KBD_MAXWAIT		opt_kbd.h
 KBD_RESETDELAY		opt_kbd.h
 KBDIO_DEBUG		opt_kbd.h
 
-ATAPI			opt_atapi.h
-ATAPI_STATIC		opt_atapi.h
-
-CMD640			opt_wd.h
-
 USERCONFIG		opt_userconfig.h
 VISUAL_USERCONFIG	opt_userconfig.h
 INTRO_USERCONFIG	opt_userconfig.h