svn commit: r347919 - in head: . share/man/man4 sys/amd64/conf sys/conf sys/dev/tx sys/i386/conf sys/modules sys/modules/tx sys/sparc64/conf

Fri May 17 15:24:15 UTC 2019

Author: brooks
Date: Fri May 17 15:24:08 2019
New Revision: 347919
URL: https://svnweb.freebsd.org/changeset/base/347919

Log:
  FCP-101: Remove tx(4).
  
  Relnotes:	yes
  FCP:		https://github.com/freebsd/fcp/blob/master/fcp-0101.md
  Reviewed by:	jhb, imp
  Differential Revision:	https://reviews.freebsd.org/D20230

Deleted:
  head/share/man/man4/tx.4
  head/sys/dev/tx/
  head/sys/modules/tx/
Modified:
  head/ObsoleteFiles.inc
  head/share/man/man4/Makefile
  head/sys/amd64/conf/GENERIC
  head/sys/conf/NOTES
  head/sys/conf/files
  head/sys/i386/conf/GENERIC
  head/sys/modules/Makefile
  head/sys/sparc64/conf/GENERIC

Modified: head/ObsoleteFiles.inc
==============================================================================

--- head/ObsoleteFiles.inc	Fri May 17 15:24:00 2019	(r347918)
+++ head/ObsoleteFiles.inc	Fri May 17 15:24:08 2019	(r347919)
@@ -56,6 +56,8 @@ OLD_FILES+=usr/share/man/man4/sn.4
 OLD_FILES+=usr/share/man/man4/if_sn.4
 OLD_FILES+=usr/share/man/man4/tl.4
 OLD_FILES+=usr/share/man/man4/if_tl.4
+OLD_FILES+=usr/share/man/man4/tx.4
+OLD_FILES+=usr/share/man/man4/if_tx.4
 # 20190513: libcap_sysctl interface change
 OLD_FILES+=lib/casper/libcap_sysctl.1
 # 20190509: tests/sys/opencrypto requires the net/py-dpkt package.

Modified: head/share/man/man4/Makefile
==============================================================================
--- head/share/man/man4/Makefile	Fri May 17 15:24:00 2019	(r347918)
+++ head/share/man/man4/Makefile	Fri May 17 15:24:08 2019	(r347919)
@@ -524,7 +524,6 @@ MAN=	aac.4 \
 	twa.4 \
 	twe.4 \
 	tws.4 \
-	tx.4 \
 	txp.4 \
 	udp.4 \
 	udplite.4 \
@@ -717,7 +716,6 @@ MLINKS+=tap.4 if_tap.4
 MLINKS+=tdfx.4 tdfx_linux.4
 MLINKS+=ti.4 if_ti.4
 MLINKS+=tun.4 if_tun.4
-MLINKS+=tx.4 if_tx.4
 MLINKS+=txp.4 if_txp.4
 MLINKS+=ure.4 if_ure.4
 MLINKS+=vge.4 if_vge.4

Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC	Fri May 17 15:24:00 2019	(r347918)
+++ head/sys/amd64/conf/GENERIC	Fri May 17 15:24:08 2019	(r347919)
@@ -278,7 +278,6 @@ device		sis			# Silicon Integrated Systems SiS 900/SiS
 device		sk			# SysKonnect SK-984x & SK-982x gigabit Ethernet
 device		ste			# Sundance ST201 (D-Link DFE-550TX)
 device		stge			# Sundance/Tamarack TC9021 gigabit Ethernet
-device		tx			# SMC EtherPower II (83c170 ``EPIC'')
 device		vge			# VIA VT612x gigabit Ethernet
 device		vr			# VIA Rhine, Rhine II
 device		wb			# Winbond W89C840F

Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES	Fri May 17 15:24:00 2019	(r347918)
+++ head/sys/conf/NOTES	Fri May 17 15:24:08 2019	(r347919)
@@ -1995,7 +1995,6 @@ device		xmphy		# XaQti XMAC II
 #       Tigon 1 and Tigon 2 chipsets.  This includes the Alteon AceNIC, the
 #       3Com 3c985, the Netgear GA620 and various others.  Note that you will
 #       probably want to bump up kern.ipc.nmbclusters a lot to use this driver.
-# tx:   SMC 9432 TX, BTX and FTX cards. (SMC EtherPower II series)
 # txp:	Support for 3Com 3cR990 cards with the "Typhoon" chipset
 # vr:   Support for various fast ethernet adapters based on the VIA
 #       Technologies VT3043 `Rhine I' and VT86C100A `Rhine II' chips,
@@ -2055,7 +2054,6 @@ device		sis		# Silicon Integrated Systems SiS 900/SiS 
 device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
 device		ste		# Sundance ST201 (D-Link DFE-550TX)
 device		stge		# Sundance/Tamarack TC9021 gigabit Ethernet
-device		tx		# SMC EtherPower II (83c170 ``EPIC'')
 device		vr		# VIA Rhine, Rhine II
 device		vte		# DM&P Vortex86 RDC R6040 Fast Ethernet
 device		wb		# Winbond W89C840F

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Fri May 17 15:24:00 2019	(r347918)
+++ head/sys/conf/files	Fri May 17 15:24:08 2019	(r347919)
@@ -3155,7 +3155,6 @@ dev/tws/tws_cam.c		optional tws
 dev/tws/tws_hdm.c		optional tws
 dev/tws/tws_services.c		optional tws
 dev/tws/tws_user.c		optional tws
-dev/tx/if_tx.c			optional tx
 dev/txp/if_txp.c		optional txp
 dev/uart/uart_bus_acpi.c	optional uart acpi
 dev/uart/uart_bus_ebus.c	optional uart ebus

Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC	Fri May 17 15:24:00 2019	(r347918)
+++ head/sys/i386/conf/GENERIC	Fri May 17 15:24:08 2019	(r347919)
@@ -260,7 +260,6 @@ device		sis			# Silicon Integrated Systems SiS 900/SiS
 device		sk			# SysKonnect SK-984x & SK-982x gigabit Ethernet
 device		ste			# Sundance ST201 (D-Link DFE-550TX)
 device		stge			# Sundance/Tamarack TC9021 gigabit Ethernet
-device		tx			# SMC EtherPower II (83c170 ``EPIC'')
 device		vge			# VIA VT612x gigabit Ethernet
 device		vr			# VIA Rhine, Rhine II
 device		vte			# DM&P Vortex86 RDC R6040 Fast Ethernet

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Fri May 17 15:24:00 2019	(r347918)
+++ head/sys/modules/Makefile	Fri May 17 15:24:08 2019	(r347919)
@@ -355,7 +355,6 @@ SUBDIR=	\
 	${_twa} \
 	twe \
 	tws \
-	tx \
 	${_txp} \
 	uart \
 	ubsec \

Modified: head/sys/sparc64/conf/GENERIC
==============================================================================
--- head/sys/sparc64/conf/GENERIC	Fri May 17 15:24:00 2019	(r347918)
+++ head/sys/sparc64/conf/GENERIC	Fri May 17 15:24:08 2019	(r347919)
@@ -207,7 +207,6 @@ device		sis		# Silicon Integrated Systems SiS 900/SiS 
 device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
 device		ste		# Sundance ST201 (D-Link DFE-550TX)
 device		stge		# Sundance/Tamarack TC9021 gigabit Ethernet
-#device		tx		# SMC EtherPower II (83c170 ``EPIC'')
 device		vr		# VIA Rhine, Rhine II
 #device		wb		# Winbond W89C840F
 device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
