From c210b0ae8e9c81b0f63ef9da3b6f43179529df81 Mon Sep 17 00:00:00 2001
From: eugen <eugen@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sun, 9 Sep 2018 18:10:35 +0000
Subject: [PATCH] MFC r316615 by sevan: Remove the last vestiges of FDC_DEBUG &
 FD_DEBUG

PR:             105608
Submitted by:   Differential Revision:  https://reviews.freebsd.org/D10303


git-svn-id: svn://svn.freebsd.org/base/stable/10@338545 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 share/man/man4/fdc.4           | 10 +---------
 sys/conf/NOTES                 |  5 -----
 sys/conf/options               |  1 -
 sys/modules/fdc/Makefile       |  6 ------
 sys/sparc64/conf/NOTES         |  1 -
 usr.sbin/fdcontrol/fdcontrol.8 | 26 +-------------------------
 6 files changed, 2 insertions(+), 47 deletions(-)

diff --git a/share/man/man4/fdc.4 b/share/man/man4/fdc.4
index 7fadf0a8c..37e523db6 100644
--- a/share/man/man4/fdc.4
+++ b/share/man/man4/fdc.4
@@ -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
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 21fe8ab28..294f02e15 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1781,11 +1781,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:
diff --git a/sys/conf/options b/sys/conf/options
index a21de0da7..82a8a8aed 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -684,7 +684,6 @@ INIT_PATH
 
 ROOTDEVNAME
 
-FDC_DEBUG		opt_fdc.h
 PCFCLOCK_VERBOSE	opt_pcfclock.h
 PCFCLOCK_MAX_RETRIES	opt_pcfclock.h
 
diff --git a/sys/modules/fdc/Makefile b/sys/modules/fdc/Makefile
index 43b85f50c..d6684eb09 100644
--- a/sys/modules/fdc/Makefile
+++ b/sys/modules/fdc/Makefile
@@ -16,10 +16,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 <bsd.kmod.mk>
diff --git a/sys/sparc64/conf/NOTES b/sys/sparc64/conf/NOTES
index 5e0228900..185a7c9ee 100644
--- a/sys/sparc64/conf/NOTES
+++ b/sys/sparc64/conf/NOTES
@@ -130,7 +130,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
diff --git a/usr.sbin/fdcontrol/fdcontrol.8 b/usr.sbin/fdcontrol/fdcontrol.8
index 8e2ab1251..210bf52c5 100644
--- a/usr.sbin/fdcontrol/fdcontrol.8
+++ b/usr.sbin/fdcontrol/fdcontrol.8
@@ -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
-- 
2.42.0