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

1 files changed, 3 insertions, 8 deletions

diff --git a/sys/pci/ide_pci.c b/sys/pci/ide_pci.c
index 51de2c1..feb54ee 100644
--- a/sys/pci/ide_pci.c
+++ b/sys/pci/ide_pci.c
@@ -26,12 +26,11 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ide_pci.c,v 1.28 1999/01/17 05:46:25 bde Exp $
+ *	$Id: ide_pci.c,v 1.29 1999/03/28 05:05:12 grog Exp $
  */
 
 #include "pci.h"
 #if NPCI > 0
-#include "opt_wd.h"
 #include "wd.h"
 
 #if NWDC > 0
@@ -1387,16 +1386,12 @@ ide_pci_probe(pcici_t tag, pcidi_t type)
 			return ("Acer Aladdin IV/V (M5229) Bus-master IDE controller");
 	        if (type == 0x55131039)
 			return ("SiS 5591 Bus-master IDE Controller");
+		if (type == 0x06401095)		/* CMD 640B IDE */
+			return NULL;		/* Let wdc_p "find" it. */
 		if (data & 0x8000)
 			return ("PCI IDE controller (busmaster capable)");
-#ifndef CMD640
-		/*
-		 * XXX the CMD640B hack should be better integrated, or
-		 * something.
-		 */
 		else
 			return ("PCI IDE controller (not busmaster capable)");
-#endif
 	};
 	return ((char*)0);
 }