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

Fri May 17 15:24:41 UTC 2019

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

Log:
  FCP-101: Remove wb(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/wb.4
  head/sys/dev/wb/
  head/sys/modules/wb/
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:26 2019	(r347921)
+++ head/ObsoleteFiles.inc	Fri May 17 15:24:34 2019	(r347922)
@@ -61,6 +61,7 @@ OLD_FILES+=usr/share/man/man4/if_tx.4
 OLD_FILES+=usr/share/man/man4/txp.4
 OLD_FILES+=usr/share/man/man4/if_txp.4
 OLD_FILES+=usr/share/man/man4/vx.4
+OLD_FILES+=usr/share/man/man4/wb.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:26 2019	(r347921)
+++ head/share/man/man4/Makefile	Fri May 17 15:24:34 2019	(r347922)
@@ -550,7 +550,6 @@ MAN=	aac.4 \
 	vte.4 \
 	${_vtnet.4} \
 	watchdog.4 \
-	wb.4 \
 	${_wbwd.4} \
 	wi.4 \
 	witness.4 \
@@ -725,7 +724,6 @@ MLINKS+=vr.4 if_vr.4
 MLINKS+=vte.4 if_vte.4
 MLINKS+=${_vtnet.4} ${_if_vtnet.4}
 MLINKS+=watchdog.4 SW_WATCHDOG.4
-MLINKS+=wb.4 if_wb.4
 MLINKS+=wi.4 if_wi.4
 MLINKS+=${_wpi.4} ${_if_wpi.4}
 MLINKS+=xe.4 if_xe.4

Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC	Fri May 17 15:24:26 2019	(r347921)
+++ head/sys/amd64/conf/GENERIC	Fri May 17 15:24:34 2019	(r347922)
@@ -278,7 +278,6 @@ device		ste			# Sundance ST201 (D-Link DFE-550TX)
 device		stge			# Sundance/Tamarack TC9021 gigabit Ethernet
 device		vge			# VIA VT612x gigabit Ethernet
 device		vr			# VIA Rhine, Rhine II
-device		wb			# Winbond W89C840F
 device		xl			# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 
 # Wireless NIC cards

Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES	Fri May 17 15:24:26 2019	(r347921)
+++ head/sys/conf/NOTES	Fri May 17 15:24:34 2019	(r347922)
@@ -2000,9 +2000,6 @@ device		xmphy		# XaQti XMAC II
 #       including the D-Link DFE520TX and D-Link DFE530TX (see 'rl' for
 #       DFE530TX+), the Hawking Technologies PN102TX, and the AOpen/Acer ALN-320.
 # vte:  DM&P Vortex86 RDC R6040 Fast Ethernet
-# wb:   Support for fast ethernet adapters based on the Winbond W89C840F chip.
-#       Note: this is not the same as the Winbond W89C940F, which is a
-#       NE2000 clone.
 # wi:   Lucent WaveLAN/IEEE 802.11 PCMCIA adapters. Note: this supports both
 #       the PCMCIA and ISA cards: the ISA card is really a PCMCIA to ISA
 #       bridge with a PCMCIA adapter plugged into it.
@@ -2054,7 +2051,6 @@ device		ste		# Sundance ST201 (D-Link DFE-550TX)
 device		stge		# Sundance/Tamarack TC9021 gigabit Ethernet
 device		vr		# VIA Rhine, Rhine II
 device		vte		# DM&P Vortex86 RDC R6040 Fast Ethernet
-device		wb		# Winbond W89C840F
 device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 
 # PCI/PCI-X/PCIe Ethernet NICs that use iflib infrastructure

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Fri May 17 15:24:26 2019	(r347921)
+++ head/sys/conf/files	Fri May 17 15:24:34 2019	(r347922)
@@ -3404,7 +3404,6 @@ dev/vte/if_vte.c		optional vte pci
 dev/vx/if_vx.c			optional vx
 dev/vx/if_vx_pci.c		optional vx pci
 dev/watchdog/watchdog.c		standard
-dev/wb/if_wb.c			optional wb pci
 dev/wi/if_wi.c			optional wi
 dev/wi/if_wi_pccard.c		optional wi pccard
 dev/wi/if_wi_pci.c		optional wi pci

Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC	Fri May 17 15:24:26 2019	(r347921)
+++ head/sys/i386/conf/GENERIC	Fri May 17 15:24:34 2019	(r347922)
@@ -261,7 +261,6 @@ device		stge			# Sundance/Tamarack TC9021 gigabit Ethe
 device		vge			# VIA VT612x gigabit Ethernet
 device		vr			# VIA Rhine, Rhine II
 device		vte			# DM&P Vortex86 RDC R6040 Fast Ethernet
-device		wb			# Winbond W89C840F
 device		xl			# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 
 # ISA Ethernet NICs.  pccard NICs included.

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Fri May 17 15:24:26 2019	(r347921)
+++ head/sys/modules/Makefile	Fri May 17 15:24:34 2019	(r347922)
@@ -374,7 +374,6 @@ SUBDIR=	\
 	${_vpo} \
 	vr \
 	vte \
-	wb \
 	${_wbwd} \
 	${_wi} \
 	wlan \

Modified: head/sys/sparc64/conf/GENERIC
==============================================================================
--- head/sys/sparc64/conf/GENERIC	Fri May 17 15:24:26 2019	(r347921)
+++ head/sys/sparc64/conf/GENERIC	Fri May 17 15:24:34 2019	(r347922)
@@ -206,7 +206,6 @@ device		sk		# SysKonnect SK-984x & SK-982x gigabit Eth
 device		ste		# Sundance ST201 (D-Link DFE-550TX)
 device		stge		# Sundance/Tamarack TC9021 gigabit Ethernet
 device		vr		# VIA Rhine, Rhine II
-#device		wb		# Winbond W89C840F
 device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 
 # Wireless NIC cards
