From owner-svn-src-all@freebsd.org Sun Sep 9 18:08:40 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B97AD109ACB0; Sun, 9 Sep 2018 18:08:40 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6E8AD7C0D1; Sun, 9 Sep 2018 18:08:40 +0000 (UTC) (envelope-from eugen@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 697681D253; Sun, 9 Sep 2018 18:08:40 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w89I8eAs049877; Sun, 9 Sep 2018 18:08:40 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w89I8dnx049872; Sun, 9 Sep 2018 18:08:39 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201809091808.w89I8dnx049872@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Sun, 9 Sep 2018 18:08:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r338544 - in stable/11: share/man/man4 sys/conf sys/modules/fdc sys/sparc64/conf usr.sbin/fdcontrol X-SVN-Group: stable-11 X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: in stable/11: share/man/man4 sys/conf sys/modules/fdc sys/sparc64/conf usr.sbin/fdcontrol X-SVN-Commit-Revision: 338544 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Sep 2018 18:08:41 -0000 Author: eugen Date: Sun Sep 9 18:08:38 2018 New Revision: 338544 URL: https://svnweb.freebsd.org/changeset/base/338544 Log: MFC r316615 by sevan: Remove the last vestiges of FDC_DEBUG & FD_DEBUG PR: 105608 Differential Revision: https://reviews.freebsd.org/D10303 Modified: stable/11/share/man/man4/fdc.4 stable/11/sys/conf/NOTES stable/11/sys/conf/options stable/11/sys/modules/fdc/Makefile stable/11/sys/sparc64/conf/NOTES stable/11/usr.sbin/fdcontrol/fdcontrol.8 Directory Properties: stable/11/ (props changed) Modified: stable/11/share/man/man4/fdc.4 ============================================================================== --- stable/11/share/man/man4/fdc.4 Sun Sep 9 17:26:44 2018 (r338543) +++ stable/11/share/man/man4/fdc.4 Sun Sep 9 18:08:38 2018 (r338544) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 11, 2006 +.Dd April 7, 2017 .Dt FDC 4 .Os .Sh NAME @@ -281,14 +281,6 @@ Third argument is a pointer to .Vt int . Drive options will always be cleared when closing the descriptor. -.It Dv FD_DEBUG -Set the driver debug level. -Third argument is a pointer to -.Vt int , -level 0 turns off all debugging. -Only applicable if the driver has -been configured with -.Cd "options FDC_DEBUG" . .It Dv FD_CLRERR Clear the internal low-level error counter. Normally, controller-level Modified: stable/11/sys/conf/NOTES ============================================================================== --- stable/11/sys/conf/NOTES Sun Sep 9 17:26:44 2018 (r338543) +++ stable/11/sys/conf/NOTES Sun Sep 9 18:08:38 2018 (r338544) @@ -1802,11 +1802,6 @@ 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: Modified: stable/11/sys/conf/options ============================================================================== --- stable/11/sys/conf/options Sun Sep 9 17:26:44 2018 (r338543) +++ stable/11/sys/conf/options Sun Sep 9 18:08:38 2018 (r338544) @@ -688,7 +688,6 @@ INIT_PATH ROOTDEVNAME -FDC_DEBUG opt_fdc.h PCFCLOCK_VERBOSE opt_pcfclock.h PCFCLOCK_MAX_RETRIES opt_pcfclock.h Modified: stable/11/sys/modules/fdc/Makefile ============================================================================== --- stable/11/sys/modules/fdc/Makefile Sun Sep 9 17:26:44 2018 (r338543) +++ stable/11/sys/modules/fdc/Makefile Sun Sep 9 18:08:38 2018 (r338544) @@ -15,10 +15,4 @@ SRCS+= opt_acpi.h acpi_if.h fdc_acpi.c SRCS+= opt_fdc.h bus_if.h card_if.h device_if.h \ isa_if.h pccarddevs.h -FDC_DEBUG?= 0 # 0/1 - -.if ${FDC_DEBUG} > 0 - echo "#define FDC_DEBUG 1" >> ${.TARGET} -.endif - .include Modified: stable/11/sys/sparc64/conf/NOTES ============================================================================== --- stable/11/sys/sparc64/conf/NOTES Sun Sep 9 17:26:44 2018 (r338543) +++ stable/11/sys/sparc64/conf/NOTES Sun Sep 9 18:08:38 2018 (r338544) @@ -129,7 +129,6 @@ nodevice ex ##################################################################### # Options we don't want to deal with -nooption FDC_DEBUG nooption COMPAT_FREEBSD4 nooption SC_RENDER_DEBUG nooption SC_DEBUG_LEVEL Modified: stable/11/usr.sbin/fdcontrol/fdcontrol.8 ============================================================================== --- stable/11/usr.sbin/fdcontrol/fdcontrol.8 Sun Sep 9 17:26:44 2018 (r338543) +++ stable/11/usr.sbin/fdcontrol/fdcontrol.8 Sun Sep 9 18:08:38 2018 (r338544) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 25, 2001 +.Dd April 7, 2017 .Dt FDCONTROL 8 .Os .Sh NAME @@ -94,30 +94,6 @@ Again, together with some more text will be returned, including the total capacity of the density settings in kilobytes. .Ss Debug Control -If the -.Xr fdc 4 -driver was configured with the -.Dv FDC_DEBUG -option, by default, device debugging information is still disabled -since it could produce huge amounts of kernel messages. -It needs to -be turned on using -.Nm -together with -.Dq Fl d Li 1 , -usually immediately before starting an operation on the respective -device the debug information is wanted for, and later turned off again -using -.Dq Fl d Li 0 . -Note that debugging levels are a driver's global option that will -affect any drives and controllers using the -.Xr fdc 4 -driver, regardless which -.Ar device -was specified on the -.Nm -command line. -.Ss Density Control The .Xr fdc 4 control utilities support two different options how to specify device