svn commit: r359178 - in head: . share/man/man4/man4.i386 sys/conf sys/dev/ctau sys/dev/cx sys/i386/conf sys/modules

[Ed Maste]

Author: emaste
Date: Fri Mar 20 16:50:19 2020
New Revision: 359178
URL: https://svnweb.freebsd.org/changeset/base/359178

Log:
  retire cx,ctau drivers
  
  The devices supported by these drivers are obsolete ISA cards, and the
  sync serial protocols they supported are essentially obsolete too.
  
  Sponsored by:	The FreeBSD Foundation

Deleted:
  head/share/man/man4/man4.i386/ctau.4
  head/share/man/man4/man4.i386/cx.4
  head/sys/dev/ctau/
  head/sys/dev/cx/cronyxfw.h
  head/sys/dev/cx/csigma.c
  head/sys/dev/cx/csigmafw.h
  head/sys/dev/cx/cxddk.c
  head/sys/dev/cx/cxddk.h
  head/sys/dev/cx/cxreg.h
  head/sys/dev/cx/if_cx.c
  head/sys/dev/cx/ng_cx.h
Modified:
  head/ObsoleteFiles.inc
  head/share/man/man4/man4.i386/Makefile
  head/sys/conf/WITHOUT_SOURCELESS_UCODE
  head/sys/conf/files.i386
  head/sys/i386/conf/NOTES
  head/sys/modules/Makefile

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Fri Mar 20 16:25:06 2020	(r359177)
+++ head/ObsoleteFiles.inc	Fri Mar 20 16:50:19 2020	(r359178)
@@ -36,6 +36,10 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20200320: cx and ctau drivers retired
+OLD_FILES+=usr/share/man/man4/ctau.4.gz
+OLD_FILES+=usr/share/man/man4/cx.4.gz
+
 # 20200318: host.conf was deprecated a long time ago.
 OLD_FILES+=etc/host.conf
 OLD_FILES+=etc/rc.d/nsswitch

Modified: head/share/man/man4/man4.i386/Makefile
==============================================================================
--- head/share/man/man4/man4.i386/Makefile	Fri Mar 20 16:25:06 2020	(r359177)
+++ head/share/man/man4/man4.i386/Makefile	Fri Mar 20 16:50:19 2020	(r359178)
@@ -4,8 +4,6 @@ MAN=	apm.4 \
 	ce.4 \
 	cp.4 \
 	CPU_ELAN.4 \
-	ctau.4 \
-	cx.4 \
 	glxiic.4 \
 	glxsb.4 \
 	longrun.4 \

Modified: head/sys/conf/WITHOUT_SOURCELESS_UCODE
==============================================================================
--- head/sys/conf/WITHOUT_SOURCELESS_UCODE	Fri Mar 20 16:25:06 2020	(r359177)
+++ head/sys/conf/WITHOUT_SOURCELESS_UCODE	Fri Mar 20 16:50:19 2020	(r359178)
@@ -16,7 +16,6 @@ nodevice	ti
 nodevice	txp
 nodevice	ce
 nodevice	cp
-nodevice	ctau
 nodevice	ipwfw
 nodevice	iwifw
 nodevice	iwmfw

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386	Fri Mar 20 16:25:06 2020	(r359177)
+++ head/sys/conf/files.i386	Fri Mar 20 16:50:19 2020	(r359178)
@@ -97,12 +97,6 @@ dev/ce/tau32-ddk.c		optional ce \
 dev/cp/cpddk.c			optional cp \
 	compile-with "${NORMAL_C} ${NO_WMISLEADING_INDENTATION}"
 dev/cp/if_cp.c			optional cp
-dev/ctau/ctau.c			optional ctau
-dev/ctau/ctddk.c		optional ctau
-dev/ctau/if_ct.c		optional ctau
-dev/cx/csigma.c			optional cx
-dev/cx/cxddk.c			optional cx
-dev/cx/if_cx.c			optional cx
 dev/glxiic/glxiic.c		optional glxiic
 dev/glxsb/glxsb.c		optional glxsb
 dev/glxsb/glxsb_hash.c		optional glxsb

Modified: head/sys/i386/conf/NOTES
==============================================================================
--- head/sys/i386/conf/NOTES	Fri Mar 20 16:25:06 2020	(r359177)
+++ head/sys/i386/conf/NOTES	Fri Mar 20 16:50:19 2020	(r359178)
@@ -501,9 +501,6 @@ device		cpufreq
 #       V.35/RS-232/RS-530/RS-449/X.21/G.703/E1/E3/T3/STS-1
 #       serial adaptor (requires sppp (default), or NETGRAPH if
 #       NETGRAPH_CRONYX is configured)
-# ctau: Cronyx Tau sync dual port V.35/RS-232/RS-530/RS-449/X.21/G.703/E1
-#       serial adaptor (requires sppp (default), or NETGRAPH if
-#       NETGRAPH_CRONYX is configured)
 # ipw:	Intel PRO/Wireless 2100 IEEE 802.11 adapter
 # iwi:	Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters
 #	Requires the iwi firmware module
@@ -526,11 +523,6 @@ device		ce
 device		cp
 hint.cs.0.at="isa"
 hint.cs.0.port="0x300"
-device		ctau
-hint.ctau.0.at="isa"
-hint.ctau.0.port="0x240"
-hint.ctau.0.irq="15"
-hint.ctau.0.drq="7"
 #options 	NETGRAPH_CRONYX		# Enable NETGRAPH support for Cronyx adapter(s)
 options 	ED_3C503
 options 	ED_HPP

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Fri Mar 20 16:25:06 2020	(r359177)
+++ head/sys/modules/Makefile	Fri Mar 20 16:50:19 2020	(r359178)
@@ -98,7 +98,6 @@ SUBDIR=	\
 	${_cpufreq} \
 	${_crypto} \
 	${_cryptodev} \
-	${_ctau} \
 	ctl \
 	${_cxgb} \
 	${_cxgbe} \
@@ -737,9 +736,6 @@ _glxsb=		glxsb
 _pcfclock=	pcfclock
 _pst=		pst
 _sbni=		sbni
-.if ${MK_SOURCELESS_UCODE} != "no"
-_ctau=		ctau
-.endif
 .endif
 
 .if ${MACHINE_CPUARCH} == "arm"