From owner-svn-src-head@freebsd.org Mon Aug 12 22:58:52 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 982E0C3E02; Mon, 12 Aug 2019 22:58:52 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 466rqw3Z0Tz47CX; Mon, 12 Aug 2019 22:58:52 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5C9435F4F; Mon, 12 Aug 2019 22:58:52 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7CMwqC2012960; Mon, 12 Aug 2019 22:58:52 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7CMwpru012952; Mon, 12 Aug 2019 22:58:51 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201908122258.x7CMwpru012952@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 12 Aug 2019 22:58:51 +0000 (UTC) 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 X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys: arm/conf arm64/conf conf powerpc/conf sparc64/conf x86/conf X-SVN-Commit-Revision: 350964 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Aug 2019 22:58:52 -0000 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"