acd goes away

6 files changed, 20 insertions, 35 deletions

diff --git a/sys/arch/alpha/alpha/autoconf.c b/sys/arch/alpha/alpha/autoconf.c
index 499c82ccecb..ad094f3ed04 100644
--- a/sys/arch/alpha/alpha/autoconf.c
+++ b/sys/arch/alpha/alpha/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.8 1998/07/01 02:29:39 angelos Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.9 1999/07/30 19:05:49 deraadt Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.16 1996/11/13 21:13:04 cgd Exp $	*/
 
 /*
@@ -141,7 +141,6 @@ struct nam2blk {
 	{ "cd",		3 },
 	{ "rd",		6 },
 	{ "sd",		8 },
-	{ "acd",	4 },
 	{ "wd",		0 },
 #if 0
 	{ "fd",		XXX },
diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 829358eac23..414a8b13638 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.19 1999/07/25 04:38:25 csapuntz Exp $	*/
+/*	$OpenBSD: conf.c,v 1.20 1999/07/30 19:05:49 deraadt Exp $	*/
 /*	$NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $	*/
 
 /*-
@@ -49,8 +49,6 @@ bdev_decl(wd);
 bdev_decl(sw);
 #include "st.h"
 #include "cd.h"
-#include "acd.h"
-bdev_decl(acd);
 #include "sd.h"
 #include "ss.h"
 #include "uk.h"
@@ -65,7 +63,7 @@ struct bdevsw	bdevsw[] =
 	bdev_swap_init(1,sw),		/* 1: swap pseudo-device */
 	bdev_tape_init(NST,st),		/* 2: SCSI tape */
 	bdev_disk_init(NCD,cd),		/* 3: SCSI CD-ROM */
-	bdev_disk_init(NACD,acd),	/* 4: ATAPI CD-ROM */
+	bdev_notdef(),			/* 4 */
 	bdev_notdef(),			/* 5 */
 	bdev_disk_init(NRD,rd),		/* 6: ram disk driver */
 	bdev_disk_init(NCCD,ccd),	/* 7: concatenated disk driver */
@@ -121,7 +119,6 @@ cdev_decl(rd);
 #endif
 cdev_decl(prom);			/* XXX XXX XXX */
 cdev_decl(wd);
-cdev_decl(acd);
 #include "cy.h"
 cdev_decl(cy);
 #ifdef XFS
@@ -170,7 +167,7 @@ struct cdevsw	cdevsw[] =
 	cdev_random_init(1,random),	/* 34: random data source */
 	cdev_gen_ipf(NIPF,ipl),		/* 35: IP filter log */
 	cdev_disk_init(NWD,wd), 	/* 36: ST506/ESDI/IDE disk */
-	cdev_disk_init(NACD,acd),	/* 37: ATAPI CD-ROM */
+	cdev_notdef(),			/* 37 */
         cdev_tty_init(NCY,cy),          /* 38: Cyclom serial port */
 	cdev_ksyms_init(NKSYMS,ksyms),	/* 39: Kernel symbols device */
 	cdev_notdef(),			/* 40 */
diff --git a/sys/arch/alpha/conf/RAMDISK b/sys/arch/alpha/conf/RAMDISK
index 84eec983697..d5ca006ce2a 100644
--- a/sys/arch/alpha/conf/RAMDISK
+++ b/sys/arch/alpha/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.25 1999/06/22 01:28:50 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.26 1999/07/30 19:05:49 deraadt Exp $
 #	$NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $
 #
 # Generic Alpha kernel.  Enough to get booted, etc., but not much more.
@@ -154,19 +154,21 @@ ne0	at 	isa? port 0x240 irq 9		# NE[12]000 ethernet cards
 ne1	at 	isa? port 0x300 irq 10		# NE[12]000 ethernet cards
 ne2	at 	isa? port 0x280 irq 9		# NE[12]000 ethernet cards
 #wss*	at	isa? port 0x530 irq 9 drq 0	# Windows Sound System
-wdc0	at	isa? port 0x1f0 irq 14		# ST506, ESDI, and IDE
-wdc1	at	isa? port 0x170 irq 15		# controllers
 #cy0	at	isa? iomem 0xd4000 irq 12	# ISA cyclom card
 
 # EISA devices
 #fea*	at	eisa? slot ?			# DEC DEFEA FDDI cards
 
-# devices/busses hanging of IDE controllers
-atapibus* at	wdc?				# Virtual ATAPI bus
-wd*	at	wdc? drive ?			# ST506/ESDI/IDE disks
+# IDE
+#pciide* at pci ? dev ? function ? flags 0x0000
+#wdc0	at isa? port 0x1f0 irq 14 flags 0x00
+#wdc1	at isa? port 0x170 irq 15 flags 0x00
+#wd*	at wdc? channel ? drive ? flags 0x0000
+#wd*	at pciide? channel ? drive ? flags 0x0000
 
-# ATAPI devices
-acd*	at	atapibus? drive?		# ATAPI CD-ROM
+#atapiscsi* at wdc? channel ?
+#atapiscsi* at pciide? channel ?
+#scsibus* at atapiscsi?
 
 # SCSI bus support
 #scsibus* at	esp?
diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha
index f491c942924..b5ef0ab16d9 100644
--- a/sys/arch/alpha/conf/files.alpha
+++ b/sys/arch/alpha/conf/files.alpha
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.alpha,v 1.25 1999/07/25 04:38:25 csapuntz Exp $
+#	$OpenBSD: files.alpha,v 1.26 1999/07/30 19:05:50 deraadt Exp $
 #	$NetBSD: files.alpha,v 1.32 1996/11/25 04:03:21 cgd Exp $
 #
 # alpha-specific configuration info
@@ -118,8 +118,6 @@ file	dev/tc/if_le_tc.c		le_tc
 #
 # Machine-independent ATAPI drivers
 #
-#include "dev/atapi/files.atapi"
-#major { acd = 4 }
 
 include "dev/atapiscsi/files.atapiscsi"
 include "dev/ata/files.ata"
diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c
index 0fea0692326..ffd768cb7ad 100644
--- a/sys/arch/i386/i386/autoconf.c
+++ b/sys/arch/i386/i386/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.28 1997/10/28 10:52:18 niklas Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.29 1999/07/30 19:05:09 deraadt Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $	*/
 
 /*-
@@ -148,7 +148,7 @@ static const char *devname[] = {
 	"",		/* 15 */
 	"",		/* 16 */
 	"rd",		/* 17 = rd */
-	"acd",		/* 18 = acd */
+	"",		/* 18 */
 	"",		/* 19 */
 	""		/* 20 */
 };
@@ -232,10 +232,6 @@ extern	struct cfdriver cd_cd;
 #if NMCD > 0
 extern	struct cfdriver mcd_cd;
 #endif
-#include "acd.h"
-#if NACD > 0
-extern	struct cfdriver acd_cd;
-#endif
 #include "fd.h"
 #if NFD > 0
 extern	struct cfdriver fd_cd;
@@ -268,9 +264,6 @@ struct	genericconf {
 #if NRD > 0
 	{ &rd_cd,  "rd",  17 },
 #endif
-#if NACD > 0
-	{ &acd_cd,  "acd",  18 },
-#endif
 	{ 0 }
 };
 
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 22ae2f62974..4061701d101 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.53 1999/07/18 22:40:53 csapuntz Exp $	*/
+/*	$OpenBSD: conf.c,v 1.54 1999/07/30 19:05:09 deraadt Exp $	*/
 /*	$NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $	*/
 
 /*
@@ -53,8 +53,6 @@ bdev_decl(wt);
 #include "st.h"
 #include "cd.h"
 #include "uk.h"
-#include "acd.h"
-bdev_decl(acd);
 #include "mcd.h"
 bdev_decl(mcd);
 #include "vnd.h"
@@ -86,7 +84,7 @@ struct bdevsw	bdevsw[] =
 	bdev_disk_init(NSCD,scd),	/* 15: Sony CD-ROM */
 	bdev_disk_init(NCCD,ccd),	/* 16: concatenated disk driver */
 	bdev_disk_init(NRD,rd),		/* 17: ram disk driver */
-	bdev_disk_init(NACD,acd),	/* 18: ATAPI CD-ROM */
+	bdev_notdef,			/* 18 */
 	bdev_disk_init(NRAID,raid),	/* 19: RAIDframe disk driver */
 };
 int	nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
@@ -153,7 +151,6 @@ cdev_decl(scd);
 #include "vt.h"
 cdev_decl(pc);
 #include "ss.h"
-cdev_decl(acd);
 #include "lpt.h"
 cdev_decl(lpt);
 #include "ch.h"
@@ -242,7 +239,7 @@ struct cdevsw	cdevsw[] =
 	cdev_ocis_init(NAPM,apm),	/* 21: Advancded Power Management */
 	cdev_fd_init(1,filedesc),	/* 22: file descriptor pseudo-device */
 	cdev_bpftun_init(NBPFILTER,bpf),/* 23: Berkeley packet filter */
-	cdev_disk_init(NACD,acd),	/* 24: ATAPI CD-ROM */
+	cdev_notdef(),			/* 24 */
 #if 0
 	cdev_ocis_init(NPCMCIA,pcmcia), /* 25: PCMCIA Bus */
 #else
@@ -429,7 +426,6 @@ static struct {
 	{ "sd", 4 },
 #if 0
 	/* XXX It's not clear at all that recognizing these will help us */
-	{ "acd", 18 },
 	{ "cd", 6 },
 	{ "mcd", 7 },		/* XXX I wonder if any BIOSes support this */
 	{ "scd", 15 }		/* 	-	   "		-	   */