Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 Aug 2019 22:58:51 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r350964 - in head/sys: arm/conf arm64/conf conf powerpc/conf sparc64/conf x86/conf
Message-ID:  <201908122258.x7CMwpru012952@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: imp
Date: Mon Aug 12 22:58:50 2019
New Revision: 350964
URL: https://svnweb.freebsd.org/changeset/base/350964

Log:
  Floppy driver really only works on x86
  
  Move the floppy driver to the x86 specific notes file.
  
  Reviewed by: jhb, manu, jhibbits, emaste
  Differential Revision: https://reviews.freebsd.org/D21208

Modified:
  head/sys/arm/conf/NOTES
  head/sys/arm64/conf/NOTES
  head/sys/conf/NOTES
  head/sys/powerpc/conf/NOTES
  head/sys/sparc64/conf/NOTES
  head/sys/x86/conf/NOTES

Modified: head/sys/arm/conf/NOTES
==============================================================================
--- head/sys/arm/conf/NOTES	Mon Aug 12 22:58:44 2019	(r350963)
+++ head/sys/arm/conf/NOTES	Mon Aug 12 22:58:50 2019	(r350964)
@@ -15,7 +15,6 @@ nooptions	MAXCPU		# value is set in machine/param.h
 # Devices in sys/conf/NOTES for which no such hardware exists on arm,
 # or the drivers don't compile...
 
-nodevice	fdc
 nodevice	sym
 
 nodevice	ccr

Modified: head/sys/arm64/conf/NOTES
==============================================================================
--- head/sys/arm64/conf/NOTES	Mon Aug 12 22:58:44 2019	(r350963)
+++ head/sys/arm64/conf/NOTES	Mon Aug 12 22:58:50 2019	(r350964)
@@ -205,9 +205,6 @@ options 	CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PRO
 # bring in camified MMC too
 options		MMCCAM
 
-# No support for floppies on arm64
-nodevice	fdc
-
 # arm64 doesn't support inb/outb, so disable chipset probing which needs it
 nooptions 	PPC_PROBE_CHIPSET
 

Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES	Mon Aug 12 22:58:44 2019	(r350963)
+++ head/sys/conf/NOTES	Mon Aug 12 22:58:50 2019	(r350964)
@@ -1698,32 +1698,6 @@ hint.ata.1.port="0x170"
 hint.ata.1.irq="15"
 
 #
-# Standard floppy disk controllers and floppy tapes, supports
-# the Y-E DATA External FDD (PC Card)
-#
-device		fdc
-hint.fdc.0.at="isa"
-hint.fdc.0.port="0x3F0"
-hint.fdc.0.irq="6"
-hint.fdc.0.drq="2"
-#
-# FDC_DEBUG enables floppy debugging.  Since the debug output is huge, you
-# gotta turn it actually on by setting the variable fd_debug with DDB,
-# however.
-options 	FDC_DEBUG
-#
-# Activate this line if you happen to have an Insight floppy tape.
-# Probing them proved to be dangerous for people with floppy disks only,
-# so it's "hidden" behind a flag:
-#hint.fdc.0.flags="1"
-
-# Specify floppy devices
-hint.fd.0.at="fdc0"
-hint.fd.0.drive="0"
-hint.fd.1.at="fdc0"
-hint.fd.1.drive="1"
-
-#
 # uart: newbusified driver for serial interfaces.  It consolidates the sio(4),
 #	sab(4) and zs(4) drivers.
 #

Modified: head/sys/powerpc/conf/NOTES
==============================================================================
--- head/sys/powerpc/conf/NOTES	Mon Aug 12 22:58:44 2019	(r350963)
+++ head/sys/powerpc/conf/NOTES	Mon Aug 12 22:58:50 2019	(r350964)
@@ -76,7 +76,6 @@ nodevice	bktr
 nodevice	ccr
 nodevice	cxgbe		# XXX: builds on powerpc64 only.
 nodevice	cxgbev
-nodevice	fdc
 nodevice	mpr		# no 64-bit atomics
 nodevice	mps		# no 64-bit atomics
 nodevice	ppc

Modified: head/sys/sparc64/conf/NOTES
==============================================================================
--- head/sys/sparc64/conf/NOTES	Mon Aug 12 22:58:44 2019	(r350963)
+++ head/sys/sparc64/conf/NOTES	Mon Aug 12 22:58:50 2019	(r350964)
@@ -124,7 +124,6 @@ options 	SC_NO_SYSMOUSE
 # Devices we don't want to deal with
 
 nodevice	bktr
-nodevice	fdc
 nodevice	ppc
 nodevice	snd_ad1816
 nodevice	snd_als4000
@@ -155,7 +154,6 @@ nodevice	snd_uaudio
 #####################################################################
 # Options we don't want to deal with
 
-nooption	FDC_DEBUG
 nooption	COMPAT_FREEBSD4
 nooption	SC_RENDER_DEBUG
 nooption	SC_DEBUG_LEVEL

Modified: head/sys/x86/conf/NOTES
==============================================================================
--- head/sys/x86/conf/NOTES	Mon Aug 12 22:58:44 2019	(r350963)
+++ head/sys/x86/conf/NOTES	Mon Aug 12 22:58:50 2019	(r350964)
@@ -78,3 +78,28 @@ device		snake_saver
 device		star_saver
 device		warp_saver
 
+#
+# Standard floppy disk controllers and floppy tapes, supports
+# the Y-E DATA External FDD (PC Card)
+#
+device		fdc
+hint.fdc.0.at="isa"
+hint.fdc.0.port="0x3F0"
+hint.fdc.0.irq="6"
+hint.fdc.0.drq="2"
+#
+# FDC_DEBUG enables floppy debugging.  Since the debug output is huge, you
+# gotta turn it actually on by setting the variable fd_debug with DDB,
+# however.
+options 	FDC_DEBUG
+#
+# Activate this line if you happen to have an Insight floppy tape.
+# Probing them proved to be dangerous for people with floppy disks only,
+# so it's "hidden" behind a flag:
+#hint.fdc.0.flags="1"
+
+# Specify floppy devices
+hint.fd.0.at="fdc0"
+hint.fd.0.drive="0"
+hint.fd.1.at="fdc0"
+hint.fd.1.drive="1"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908122258.x7CMwpru012952>