Switchover to new IDE framework, and do away with ed finally

3 files changed, 34 insertions, 32 deletions

diff --git a/sys/arch/arc/arc/conf.c b/sys/arch/arc/arc/conf.c
index 6883f5a904d..c0b5e64c531 100644
--- a/sys/arch/arc/arc/conf.c
+++ b/sys/arch/arc/arc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.26 1998/10/14 18:28:06 imp Exp $ */
+/*	$OpenBSD: conf.c,v 1.27 1999/08/12 13:06:33 niklas Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)conf.c	8.2 (Berkeley) 11/14/93
- *      $Id: conf.c,v 1.26 1998/10/14 18:28:06 imp Exp $
+ *      $Id: conf.c,v 1.27 1999/08/12 13:06:33 niklas Exp $
  */
 
 #include <sys/param.h>
@@ -63,10 +63,8 @@ bdev_decl(sd);
 bdev_decl(cd);
 #include "fdc.h"
 bdev_decl(fd);
-#include "wdc.h"
+#include "wd.h"
 bdev_decl(wd);
-#include "acd.h"
-bdev_decl(acd);
 #include "ccd.h"
 #include "rd.h"
 bdev_decl(rd);
@@ -77,8 +75,8 @@ struct bdevsw	bdevsw[] =
 	bdev_swap_init(1,sw),		/* 1: should be here swap pseudo-dev */
 	bdev_disk_init(NVND,vnd),	/* 2: vnode disk driver */
 	bdev_disk_init(NCD,cd),		/* 3: SCSI CD-ROM */
-	bdev_disk_init(NWDC,wd),	/* 4: ST506/ESDI/IDE disk */
-	bdev_disk_init(NACD,acd),	/* 5: ATAPI CD-ROM */
+	bdev_disk_init(NWD,wd),		/* 4: ST506/ESDI/IDE disk */
+	bdev_notdef(),			/* 5:  */
 	bdev_disk_init(NCCD,ccd),	/* 6: concatenated disk driver */
 	bdev_disk_init(NFDC,fd),	/* 7: Floppy disk driver */
 	bdev_disk_init(NRD,rd),		/* 8: RAM disk (for install) */
@@ -197,8 +195,8 @@ struct cdevsw	cdevsw[] =
 	cdev_mouse_init(NPC,pms),	/* 15: builtin PS2 style mouse */
 	cdev_lpt_init(NLPT,lpt),	/* 16: Parallel printer interface */
 	cdev_tty_init(NCOM,com),	/* 17: 16C450 serial interface */
-	cdev_disk_init(NWDC,wd),	/* 18: ST506/ESDI/IDE disk */
-	cdev_disk_init(NACD,acd),	/* 19: ATAPI CD-ROM */
+	cdev_disk_init(NWD,wd),		/* 18: ST506/ESDI/IDE disk */
+	cdev_notdef(),			/* 19: */
 	cdev_tty_init(NPTY,pts),	/* 20: pseudo-tty slave */
 	cdev_ptc_init(NPTY,ptc),	/* 21: pseudo-tty master */
 	cdev_disk_init(NRD,rd),		/* 22: ramdisk device */
diff --git a/sys/arch/arc/conf/GENERIC b/sys/arch/arc/conf/GENERIC
index 21b9bfdc9db..77e26d9afe1 100644
--- a/sys/arch/arc/conf/GENERIC
+++ b/sys/arch/arc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.27 1998/05/05 05:48:48 imp Exp $
+#	$OpenBSD: GENERIC,v 1.28 1999/08/12 13:06:33 niklas Exp $
 #
 #	Generic configuration file for MIPS R4x00 ARC Systems
 #
@@ -60,17 +60,27 @@ lpt0		at isa? port 0x378 irq 7
 # Joystick driver. Probe is a little strange; add only if you have one.
 # joy0		at isa? port 0x201
 
-wdc0		at isa? port 0x1f0 irq 14	# ST506, ESDI, IDE controllers
-wdc1		at isa? port 0x170 irq 15
-wd*		at wdc? drive ?
-
-atapibus*	at wdc?
-acd*		at atapibus? drive?
-
-ep0		at isa? port ? irq ?           # 3C509 ethernet cards
-ed0    		at isa? port 0x280 iomem 0xd0000 irq 9  # WD/SMC, 3C503,
-ed1    		at isa? port 0x250 iomem 0xd8000 irq 9  # NE[12]000 ethernet
-ed2    		at isa? port 0x300 iomem 0xcc000 irq 10 # cards
+# IDE controllers
+wdc0	at isa? port 0x1f0 irq 14 flags 0x00
+wdc1	at isa? port 0x170 irq 15 flags 0x00
+#wdc*	at isapnp?
+
+# IDE hard drives
+wd*	at wdc? channel ? drive ? flags 0x0000
+
+# ATAPI<->SCSI
+atapiscsi* at wdc? channel ?
+scsibus* at atapiscsi?
+
+ep0	at isa? port ? irq ?		        # 3C509 ethernet cards
+we0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC 80x3 ethernet
+we1	at isa? port 0x300 iomem 0xcc000 irq 10	#
+#we*	at isapnp?
+ec0	at isa? port 0x250 iomem 0xd8000 irq 9	# 3C503 ethernet
+ne0	at isa? port 0x240 irq 9		# NE[12]000 ethernet
+ne1	at isa? port 0x300 irq 10		# NE[12]000 ethernet
+ne2	at isa? port 0x280 irq 9		# NE[12]000 ethernet
+#ne*	at isapnp?				# NE[12]000 PnP ethernet
 
 btl0		at isa? port 0x330 irq ? drq ?
 scsibus* 	at btl?
diff --git a/sys/arch/arc/conf/files.arc b/sys/arch/arc/conf/files.arc
index 310b008a838..c3e7628e08f 100644
--- a/sys/arch/arc/conf/files.arc
+++ b/sys/arch/arc/conf/files.arc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.arc,v 1.19 1998/05/05 05:44:41 imp Exp $
+#	$OpenBSD: files.arc,v 1.20 1999/08/12 13:06:33 niklas Exp $
 #
 # maxpartitions must be first item in files.${ARCH}
 #
@@ -18,10 +18,11 @@ file	arch/arc/arc/trap.c
 file	arch/mips/mips/arcbios.c
 
 #
-#	Machine-independent ATAPI drivers 
+# Machine-independent ATAPI drivers
 #
-include "../../../dev/atapi/files.atapi"
-major	{ acd = 5 }
+
+include "../../../dev/atapiscsi/files.atapiscsi"
+include "../../../dev/ata/files.ata"
 
 #
 #	System BUS types
@@ -125,13 +126,6 @@ file	arch/arc/dev/com_lbus.c		com & (com_pica | com_algor)
 device  joy
 attach  joy at isa
 file    arch/arc/isa/joy.c             joy needs-flag
-
-# National Semiconductor DS8390/WD83C690-based boards
-# (WD/SMC 80x3 family, SMC Ultra [8216], 3Com 3C503, NE[12]000, and clones)
-# XXX conflicts with other ports; can't be in files.isa
-device  ed: ether, ifnet
-attach  ed at isa with ed_isa
-attach  ed at pcmcia with ed_pcmcia
 file    dev/isa/if_ed.c                 ed & (ed_isa | ed_pcmcia) needs-flag
 
 # PC parallel ports (XXX what chip?)