as promised 18 years ago, consolidate isa floppy disks in files.isa

ok deraadt

4 files changed, 16 insertions, 35 deletions

diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha
index 306add1ac68..3f9e838116b 100644
--- a/sys/arch/alpha/conf/files.alpha
+++ b/sys/arch/alpha/conf/files.alpha
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.alpha,v 1.99 2014/07/11 21:54:37 tedu Exp $
+#	$OpenBSD: files.alpha,v 1.100 2014/12/04 21:03:50 tedu Exp $
 #	$NetBSD: files.alpha,v 1.32 1996/11/25 04:03:21 cgd Exp $
 #
 # alpha-specific configuration info
@@ -126,6 +126,7 @@ include	"dev/ata/files.ata"
 include	"dev/pci/files.pci"	# XXX some ISA devs are 'at pci' too.
 include	"dev/isa/files.isa"
 major	{wd = 0}
+major	{fd = 4}
 
 device	pcic: pcmciabus
 file	dev/ic/i82365.c			pcic
@@ -153,17 +154,6 @@ file	arch/alpha/isa/isadma_bounce.c		isadma_bounce & isa_dma
 
 include	"dev/pckbc/files.pckbc"
 
-# Floppy disk controller
-#device	fdc {[drive = -1]}: isa_dma
-device	fdc {[drive = -1]}
-attach	fdc at isa
-file	dev/isa/fdc.c				fdc needs-flag
-
-device	fd: disk, isa_dma
-attach	fd at fdc
-file	dev/isa/fd.c				fd needs-flag
-major	{fd = 4}
-
 #
 # EISA Bus support
 #
diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64
index e1cd6fa6d6b..103b653baa0 100644
--- a/sys/arch/amd64/conf/files.amd64
+++ b/sys/arch/amd64/conf/files.amd64
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.amd64,v 1.74 2014/07/11 21:54:37 tedu Exp $
+#	$OpenBSD: files.amd64,v 1.75 2014/12/04 21:03:50 tedu Exp $
 
 maxpartitions 16
 maxusers 2 16 128
@@ -183,15 +183,6 @@ include	"dev/pckbc/files.pckbc"
 
 file	arch/amd64/amd64/wscons_machdep.c	wsdisplay
 
-# Floppy disk controller
-device	fdc {[drive = -1]}
-attach	fdc at isa
-file	dev/isa/fdc.c				fdc needs-flag
-
-device	fd: disk, isa_dma
-attach	fd at fdc
-file	dev/isa/fd.c				fd needs-flag
-
 pseudo-device	pctr
 file	arch/amd64/amd64/pctr.c		pctr needs-flag
 
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index c596d834231..86edfb58219 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.218 2014/09/08 01:47:05 guenther Exp $
+#	$OpenBSD: files.i386,v 1.219 2014/12/04 21:03:51 tedu Exp $
 #
 # new style config file for i386 architecture
 #
@@ -177,6 +177,7 @@ file	dev/pci/if_hme_pci.c		hme_pci
 #
 
 major	{wd = 0}
+major	{fd = 2}
 
 include "dev/isa/files.isa"
 file	arch/i386/isa/isa_machdep.c	isabus
@@ -204,17 +205,6 @@ file	arch/i386/isa/mms.c		mms needs-flag
 include	"dev/wscons/files.wscons"
 include	"dev/pckbc/files.pckbc"
 
-# Floppy disk controller
-# XXX temporarily conflicts with arc, will soon move to files.isa
-device	fdc {[drive = -1]}
-attach	fdc at isa
-file	dev/isa/fdc.c		fdc needs-flag
-
-device	fd: disk, isa_dma
-attach	fd at fdc
-file	dev/isa/fd.c		fd needs-flag
-major	{fd = 2}
-
 # Adaptec AHA-284x VL SCSI controllers
 # device declaration in sys/conf/files
 attach	ahc at isa with ahc_isa
diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa
index 34e02cd9c96..f28f80ce6e0 100644
--- a/sys/dev/isa/files.isa
+++ b/sys/dev/isa/files.isa
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.isa,v 1.116 2014/10/18 15:37:06 miod Exp $
+#	$OpenBSD: files.isa,v 1.117 2014/12/04 21:03:51 tedu 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.
@@ -7,6 +7,7 @@
 
 # ports should specify appropriate major numbers for the following
 # devices:
+#	fd
 #	wd
 
 device	isa {[port = -1], [size = 0],
@@ -24,6 +25,15 @@ device	isadma
 attach	isadma at isa: isa_dma
 file	dev/isa/isadma.c		isadma needs-flag
 
+# Floppy disk controller
+device	fdc {[drive = -1]}
+attach	fdc at isa
+file	dev/isa/fdc.c				fdc needs-flag
+
+device	fd: disk, isa_dma
+attach	fd at fdc
+file	dev/isa/fd.c				fd needs-flag
+
 #
 # 8250/16[45]50-based multi-port serial boards
 #