A chance encounter with a surprising comment sent me on a fun trip.
# Floppy disk controller
# XXX temporarily conflicts with arc, will soon move to files.isa
First, that turns out to be referring to MIPS based ARC machines, not
the arc(4) RAID controller. Refer to arc.html on the website for more
details, including the fact that this platform was retired after 2.3.
That fact provides some context for the "temporarily".
I think we can move fdc conf attachments into files.isa now. This
directly affects alpha, i386, and amd64, but I also test configged
hppa, loongson, and octeon which all include files.isa, and then I
test configged sparc and sparc64 and vax just for good measure.
Index: arch/alpha/conf/files.alpha
===================================================================
RCS file: /cvs/src/sys/arch/alpha/conf/files.alpha,v
retrieving revision 1.99
diff -u -p -r1.99 files.alpha
--- arch/alpha/conf/files.alpha 11 Jul 2014 21:54:37 -0000 1.99
+++ arch/alpha/conf/files.alpha 3 Dec 2014 05:29:54 -0000
@@ -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
@@ -152,17 +153,6 @@ define isadma_bounce
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
Index: arch/amd64/conf/files.amd64
===================================================================
RCS file: /cvs/src/sys/arch/amd64/conf/files.amd64,v
retrieving revision 1.74
diff -u -p -r1.74 files.amd64
--- arch/amd64/conf/files.amd64 11 Jul 2014 21:54:37 -0000 1.74
+++ arch/amd64/conf/files.amd64 3 Dec 2014 05:31:37 -0000
@@ -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
Index: arch/i386/conf/files.i386
===================================================================
RCS file: /cvs/src/sys/arch/i386/conf/files.i386,v
retrieving revision 1.218
diff -u -p -r1.218 files.i386
--- arch/i386/conf/files.i386 8 Sep 2014 01:47:05 -0000 1.218
+++ arch/i386/conf/files.i386 3 Dec 2014 05:32:11 -0000
@@ -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
@@ -203,17 +204,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
Index: dev/isa/files.isa
===================================================================
RCS file: /cvs/src/sys/dev/isa/files.isa,v
retrieving revision 1.116
diff -u -p -r1.116 files.isa
--- dev/isa/files.isa 18 Oct 2014 15:37:06 -0000 1.116
+++ dev/isa/files.isa 3 Dec 2014 05:29:10 -0000
@@ -7,6 +7,7 @@
# ports should specify appropriate major numbers for the following
# devices:
+# fd
# wd
device isa {[port = -1], [size = 0],
@@ -23,6 +24,15 @@ define isa_dma
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
