Enable new ATA/ATAPISCSI functionality as default.

9 files changed, 74 insertions, 65 deletions

diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 85c624258e0..829358eac23 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.18 1998/09/25 09:20:52 todd Exp $	*/
+/*	$OpenBSD: conf.c,v 1.19 1999/07/25 04:38:25 csapuntz Exp $	*/
 /*	$NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@
 #include <sys/conf.h>
 #include <sys/vnode.h>
 
-#include "wdc.h"
+#include "wd.h"
 bdev_decl(wd);
 bdev_decl(sw);
 #include "st.h"
@@ -61,7 +61,7 @@ bdev_decl(rd);
 
 struct bdevsw	bdevsw[] =
 {
-	bdev_disk_init(NWDC,wd),	/* 0: ST506/ESDI/IDE disk */
+	bdev_disk_init(NWD,wd),	        /* 0: ST506/ESDI/IDE disk */
 	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 */
@@ -169,7 +169,7 @@ struct cdevsw	cdevsw[] =
 	cdev_uk_init(NUK,uk),		/* 33: SCSI unknown */
 	cdev_random_init(1,random),	/* 34: random data source */
 	cdev_gen_ipf(NIPF,ipl),		/* 35: IP filter log */
-	cdev_disk_init(NWDC,wd),	/* 36: ST506/ESDI/IDE disk */
+	cdev_disk_init(NWD,wd), 	/* 36: ST506/ESDI/IDE disk */
 	cdev_disk_init(NACD,acd),	/* 37: ATAPI CD-ROM */
         cdev_tty_init(NCY,cy),          /* 38: Cyclom serial port */
 	cdev_ksyms_init(NKSYMS,ksyms),	/* 39: Kernel symbols device */
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index cdefb0bf3ce..143326e034c 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.41 1999/06/29 06:06:27 jason Exp $
+#	$OpenBSD: GENERIC,v 1.42 1999/07/25 04:38:25 csapuntz Exp $
 #	$NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
 #
 # Generic Alpha kernel.  Enough to get booted, etc., but not much more.
@@ -121,8 +121,6 @@ ne1	at	isa? port 0x300 irq 10		# NE[12]000 ethernet cards
 ne2	at	isa? port 0x280 irq 9		# NE[12]000 ethernet cards
 ep*	at	isa? port ? irq ?		# 3C509 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
 #aic0	at	isa? port 0x340 irq 11		# Adaptec 152[02] SCSI
 # option for using CD1400 handshaking for incoming data
@@ -134,13 +132,17 @@ cy0     at	isa? iomem 0xd4000 irq 12	# ISA cyclom card
 fea*	at	eisa? slot ?			# DEC DEFEA FDDI cards
 #ahc*	at	eisa? slot ?			# Adaptec 274x, aic7770 SCSI
 
-# devices/busses hanging of IDE controllers
-atapibus* at	wdc?				# Virtual ATAPI bus
-wd*	at	wdc? drive ?			# ST506/ESDI/IDE disks
-
-# ATAPI devices
-acd*	at	atapibus? drive?		# ATAPI CD-ROM
-
+# 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
+
+#atapiscsi* at wdc? channel ?
+#atapiscsi* at pciide? channel ?
+#scsibus* at atapiscsi?
+ 
 # SCSI bus support
 scsibus* at	esp?
 scsibus* at	ncr?
diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha
index c6d2009aa33..f491c942924 100644
--- a/sys/arch/alpha/conf/files.alpha
+++ b/sys/arch/alpha/conf/files.alpha
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.alpha,v 1.24 1999/01/08 03:16:16 niklas Exp $
+#	$OpenBSD: files.alpha,v 1.25 1999/07/25 04:38:25 csapuntz Exp $
 #	$NetBSD: files.alpha,v 1.32 1996/11/25 04:03:21 cgd Exp $
 #
 # alpha-specific configuration info
@@ -118,9 +118,11 @@ file	dev/tc/if_le_tc.c		le_tc
 #
 # Machine-independent ATAPI drivers
 #
-include "dev/atapi/files.atapi"
-major { acd = 4 }
+#include "dev/atapi/files.atapi"
+#major { acd = 4 }
 
+include "dev/atapiscsi/files.atapiscsi"
+include "dev/ata/files.ata"
 
 # XXX Dummy bus needed for some multi-homed devices specified in files.isa
 define	pcmcia {}
@@ -141,7 +143,7 @@ major { wd = 0 }
 #device	jeisa at ibus: eisabus
 
 file	arch/alpha/isa/isa_machdep.c	isa
-file     arch/alpha/pci/pciide_machdep.c  pci
+file    arch/alpha/pci/pciide_machdep.c  pci
 
 device	pckbc { }
 attach	pckbc at isa
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 1221345a45e..0241386e034 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.115 1999/07/24 22:33:24 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.116 1999/07/25 04:38:26 csapuntz Exp $
 #	$NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
 #
 #	GENERIC -- everything that's currently supported
@@ -149,15 +149,26 @@ fd*	at fdc? drive ?
 
 #mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
 
-wdc0	at isa? port 0x1f0 irq 14	# ST506, ESDI, and IDE controllers
-wdc1	at isa? port 0x170 irq 15
-wd*	at wdc? drive ?
+# IDE controllers
+pciide* at pci ? dev ? function ? flags 0x0000
 
-atapibus* at wdc?
-acd*	at atapibus? drive?
+wdc0	at isa? port 0x1f0 irq 14 flags 0x00
+wdc1	at isa? port 0x170 irq 15 flags 0x00
+wdc*	at pcmcia? function ?
+wdc*	at isapnp?
+
+# IDE hard drives
+wd*	at wdc? channel ? drive ? flags 0x0000
+wd*	at pciide? channel ? drive ? flags 0x0000
+
+# ATAPI<->SCSI
+atapiscsi* at wdc? channel ?
+atapiscsi* at pciide? channel ?
+scsibus* at atapiscsi?
 
 wt0	at isa? port 0x308 irq 5 drq 1	# Archive and Wangtek QIC tape drives
 
+# Networking devices
 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?
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index 659146d4028..d5c1f8ab611 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.64 1999/05/23 20:49:39 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.65 1999/07/25 04:38:26 csapuntz Exp $
 #	from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp 
 #
 #	Install kernels no longer support X.
@@ -151,12 +151,22 @@ fd*	at fdc? drive ?
 
 #mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
 
-wdc0	at isa? port 0x1f0 irq 14	# ST506, ESDI, and IDE controllers
-wdc1	at isa? port 0x170 irq 15
-wd*	at wdc? drive ?
+# IDE controllers
+pciide* at pci ? dev ? function ? flags 0x0000
 
-atapibus* at wdc?
-acd*	at atapibus? drive?
+wdc0	at isa? port 0x1f0 irq 14 flags 0x00
+wdc1	at isa? port 0x170 irq 15 flags 0x00
+wdc*	at pcmcia? function ?
+wdc*	at isapnp?
+
+# IDE hard drives
+wd*	at wdc? channel ? drive ? flags 0x0000
+wd*	at pciide? channel ? drive ? flags 0x0000
+
+# ATAPI<->SCSI
+atapiscsi* at wdc? channel ?
+atapiscsi* at pciide? channel ?
+scsibus* at atapiscsi?
 
 #wt0	at isa? port 0x308 irq 5 drq 1		# Archive/Wangtek QIC tapes
 
diff --git a/sys/conf/files b/sys/conf/files
index aefbe5bde73..95a2a47ee6d 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$OpenBSD: files,v 1.121 1999/07/18 21:25:20 csapuntz Exp $
+#	$OpenBSD: files,v 1.122 1999/07/25 04:38:26 csapuntz Exp $
 #	$NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
@@ -49,12 +49,12 @@ define	rtl80x9		# RealTek 8019/8029 NE2000-compatible
 define  wsconsdev {[console = -1]}
 
 #Start uncommenting for new ATA stuff
-#define  wdc_base
-#define  ata {[channel = -1], [drive = -1]}
-#define  atapi {[channel = -1]}
-## Common code for ESDI/IDE/etc. controllers
-#device  wdc: ata, atapi, wdc_base
-#file    dev/ic/wdc.c wdc_base
+define  wdc_base
+define  ata {[channel = -1], [drive = -1]}
+define  atapi {[channel = -1]}
+# Common code for ESDI/IDE/etc. controllers
+device  wdc: ata, atapi, wdc_base
+file    dev/ic/wdc.c wdc_base
 #End uncommenting for new ATA stuff
 
 # "Chipset" drivers.  These are the bus-independent routines which
diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa
index ee401d51616..fbfc64b29e7 100644
--- a/sys/dev/isa/files.isa
+++ b/sys/dev/isa/files.isa
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.isa,v 1.58 1999/07/22 00:35:15 deraadt Exp $
+#	$OpenBSD: files.isa,v 1.59 1999/07/25 04:38:26 csapuntz Exp $
 #	$NetBSD: files.isa,v 1.21 1996/05/16 03:45:55 mycroft Exp $
 #
 # Config file and device description for machine-independent ISA code.
@@ -117,21 +117,9 @@ device	pcd: disk, opti
 attach	pcd at isa
 file	dev/isa/pcd.c			pcd needs-flag
 
-#Start uncommenting for new ATA stuff
-## ISA "wd" (ESDI/IDE/etc.) controllers, ATAPI bus
-#attach wdc at isa with wdc_isa: isa_dma
-#file   dev/isa/wdc_isa.c                wdc_isa
-#end uncommenting for new ATA stuff
-
-#Start comment this out for new ATA stuff
-define       ata {drive = -1}
-device       wdc {drive = -1}: atapi, ata
-attach       wdc at isa with wdc_isa
-device       wd: disk
-attach       wd at wdc
-file dev/isa/wdc.c                   wdc & (wdc_isa | wdc_isapnp) needs-flag
-file dev/isa/wd.c                    wd needs-flag
-#End comment this out for new ATA stuff
+# ISA "wd" (ESDI/IDE/etc.) controllers, ATAPI bus
+attach wdc at isa with wdc_isa: isa_dma
+file   dev/isa/wdc_isa.c                wdc_isa
 
 # Wangtek- and Archive-compatible tape controller boards
 device	wt: tape, isa_dma
diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci
index 71ed1154cdc..64fc753e9e3 100644
--- a/sys/dev/pci/files.pci
+++ b/sys/dev/pci/files.pci
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.pci,v 1.41 1999/07/18 21:25:19 csapuntz Exp $
+#	$OpenBSD: files.pci,v 1.42 1999/07/25 04:38:26 csapuntz Exp $
 #	$NetBSD: files.pci,v 1.20 1996/09/24 17:47:15 christos Exp $
 #
 # Config file and device description for machine-independent PCI code.
@@ -85,12 +85,10 @@ device	ncr: scsi
 attach	ncr at pci
 file	dev/pci/ncr.c			ncr
 
-#Start uncommenting for new ATA stuff
-## PCI IDE controllers
-#device	pciide {[channel = -1]}: wdc_base, ata, atapi
-#attach	pciide at pci
-#file	dev/pci/pciide.c		pciide
-#End uncommenting for new ATA stuff
+# PCI IDE controllers
+device	pciide {[channel = -1]}: wdc_base, ata, atapi
+attach	pciide at pci
+file	dev/pci/pciide.c		pciide
 
 # PCI-PCI bridge chips
 device	ppb: pcibus
diff --git a/sys/dev/pcmcia/files.pcmcia b/sys/dev/pcmcia/files.pcmcia
index 8bc77169822..e1a62ea63d7 100644
--- a/sys/dev/pcmcia/files.pcmcia
+++ b/sys/dev/pcmcia/files.pcmcia
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.pcmcia,v 1.20 1999/07/20 21:51:21 fgsch Exp $
+#	$OpenBSD: files.pcmcia,v 1.21 1999/07/25 04:38:26 csapuntz Exp $
 #	$NetBSD: files.pcmcia,v 1.9 1998/06/21 18:45:41 christos Exp $
 #
 # Config.new file and device description for machine-independent PCMCIA code.
@@ -29,11 +29,9 @@ file	dev/pcmcia/aic_pcmcia.c			aic_pcmcia
 attach	com at pcmcia with com_pcmcia
 file	dev/pcmcia/com_pcmcia.c			com_pcmcia | pccom_pcmcia
 
-#Start uncommenting for new ATA stuff
 ## PCMCIA IDE controller
-#attach	wdc at pcmcia with wdc_pcmcia
-#file	dev/pcmcia/wdc_pcmcia.c			wdc_pcmcia
-#end uncommenting for new ATA stuff
+attach	wdc at pcmcia with wdc_pcmcia
+file	dev/pcmcia/wdc_pcmcia.c			wdc_pcmcia
 
 # SMC91Cxx Ethernet Controllers (i.e. Megahertz X-Jack)
 attach	sm at pcmcia with sm_pcmcia