From ea566940e11e8a6a4944c8905ed562dec5ce82fc Mon Sep 17 00:00:00 2001 From: Sevan Janiyan Date: Fri, 7 Apr 2017 16:14:25 +0000 Subject: [PATCH] Remove the last vestiges of FDC_DEBUG & FD_DEBUG FDC_DEBUG is not referenced in any c or header files but traces of it still remain in other files. PR: 105608 Reported by: Eugene Grosbein Reviewed by: imp Approved by: bcr (mentor) MFC after: 7 days Differential Revision: https://reviews.freebsd.org/D10303 --- 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 7fadf0a8cb19..37e523db6769 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 fa7c74b33909..bebf00c23853 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1812,11 +1812,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 fde61d84d8fe..21f125592e80 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -691,7 +691,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 0f39acb4c596..400e75a1a630 100644 --- a/sys/modules/fdc/Makefile +++ b/sys/modules/fdc/Makefile @@ -11,10 +11,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 diff --git a/sys/sparc64/conf/NOTES b/sys/sparc64/conf/NOTES index eda622655f0a..a92fa3388907 100644 --- a/sys/sparc64/conf/NOTES +++ b/sys/sparc64/conf/NOTES @@ -128,7 +128,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 8e2ab1251b2b..210bf52c5820 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