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

Fri May 17 15:23:50 UTC 2019

Author: brooks
Date: Fri May 17 15:23:43 2019
New Revision: 347916
URL: https://svnweb.freebsd.org/changeset/base/347916

Log:
  FCP-101: Remove sf(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/sf.4
  head/sys/dev/sf/
  head/sys/modules/sf/
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:23:34 2019	(r347915)
+++ head/ObsoleteFiles.inc	Fri May 17 15:23:43 2019	(r347916)
@@ -50,6 +50,8 @@ OLD_FILES+=usr/share/man/man4/ex.4
 OLD_FILES+=usr/share/man/man4/fe.4
 OLD_FILES+=usr/share/man/man4/pcn.4
 OLD_FILES+=usr/share/man/man4/if_pcn.4
+OLD_FILES+=usr/share/man/man4/sf.4
+OLD_FILES+=usr/share/man/man4/if_sf.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:23:34 2019	(r347915)
+++ head/share/man/man4/Makefile	Fri May 17 15:23:43 2019	(r347916)
@@ -451,7 +451,6 @@ MAN=	aac.4 \
 	sem.4 \
 	send.4 \
 	ses.4 \
-	sf.4 \
 	${_sfxge.4} \
 	sge.4 \
 	siba.4 \
@@ -701,7 +700,6 @@ MLINKS+=scsi.4 CAM.4 \
 	scsi.4 cam.4 \
 	scsi.4 scbus.4 \
 	scsi.4 SCSI.4
-MLINKS+=sf.4 if_sf.4
 MLINKS+=sge.4 if_sge.4
 MLINKS+=sis.4 if_sis.4
 MLINKS+=sk.4 if_sk.4

Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC	Fri May 17 15:23:34 2019	(r347915)
+++ head/sys/amd64/conf/GENERIC	Fri May 17 15:23:43 2019	(r347916)
@@ -273,7 +273,6 @@ device		nfe			# nVidia nForce MCP on-board Ethernet
 device		nge			# NatSemi DP83820 gigabit Ethernet
 device		re			# RealTek 8139C+/8169/8169S/8110S
 device		rl			# RealTek 8129/8139
-device		sf			# Adaptec AIC-6915 (``Starfire'')
 device		sge			# Silicon Integrated Systems SiS190/191
 device		sis			# Silicon Integrated Systems SiS 900/SiS 7016
 device		sk			# SysKonnect SK-984x & SK-982x gigabit Ethernet

Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES	Fri May 17 15:23:34 2019	(r347915)
+++ head/sys/conf/NOTES	Fri May 17 15:23:43 2019	(r347916)
@@ -1977,11 +1977,6 @@ device		xmphy		# XaQti XMAC II
 #       chipset and is supported by this driver, not the 'vr' driver.
 # rtwn: RealTek wireless adapters.
 # rtwnfw: RealTek wireless firmware.
-# sf:   Support for Adaptec Duralink PCI fast ethernet adapters based on the
-#       Adaptec AIC-6915 "starfire" controller.
-#       This includes dual and quad port cards, as well as one 100baseFX card.
-#       Most of these are 64-bit PCI devices, except for one single port
-#       card which is 32-bit.
 # sge:  Silicon Integrated Systems SiS190/191 Fast/Gigabit Ethernet adapter
 # sis:  Support for NICs based on the Silicon Integrated Systems SiS 900,
 #       SiS 7016 and NS DP83815 PCI fast ethernet controller chips.
@@ -2066,7 +2061,6 @@ device		my		# Myson Fast Ethernet (MTD80X, MTD89X)
 device		nge		# NatSemi DP83820 gigabit Ethernet
 device		re		# RealTek 8139C+/8169/8169S/8110S
 device		rl		# RealTek 8129/8139
-device		sf		# Adaptec AIC-6915 (``Starfire'')
 device		sge		# Silicon Integrated Systems SiS190/191
 device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
 device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Fri May 17 15:23:34 2019	(r347915)
+++ head/sys/conf/files	Fri May 17 15:23:43 2019	(r347916)
@@ -3009,7 +3009,6 @@ dev/sdhci/sdhci_fdt_gpio.c	optional sdhci fdt gpio
 dev/sdhci/sdhci_if.m		optional sdhci
 dev/sdhci/sdhci_acpi.c		optional sdhci acpi
 dev/sdhci/sdhci_pci.c		optional sdhci pci
-dev/sf/if_sf.c			optional sf pci
 dev/sge/if_sge.c		optional sge pci
 dev/siis/siis.c			optional siis pci
 dev/sis/if_sis.c		optional sis pci

Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC	Fri May 17 15:23:34 2019	(r347915)
+++ head/sys/i386/conf/GENERIC	Fri May 17 15:23:43 2019	(r347916)
@@ -255,7 +255,6 @@ device		nfe			# nVidia nForce MCP on-board Ethernet
 device		nge			# NatSemi DP83820 gigabit Ethernet
 device		re			# RealTek 8139C+/8169/8169S/8110S
 device		rl			# RealTek 8129/8139
-device		sf			# Adaptec AIC-6915 (``Starfire'')
 device		sge			# Silicon Integrated Systems SiS190/191
 device		sis			# Silicon Integrated Systems SiS 900/SiS 7016
 device		sk			# SysKonnect SK-984x & SK-982x gigabit Ethernet

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Fri May 17 15:23:34 2019	(r347915)
+++ head/sys/modules/Makefile	Fri May 17 15:23:43 2019	(r347916)
@@ -325,7 +325,6 @@ SUBDIR=	\
 	sdhci_pci \
 	sem \
 	send \
-	${_sf} \
 	${_sfxge} \
 	sge \
 	${_sgx} \
@@ -516,7 +515,6 @@ _pfsync=	pfsync
 _bce=		bce
 _fxp=		fxp
 _ispfw=		ispfw
-_sf=		sf
 _ti=		ti
 _txp=		txp
 

Modified: head/sys/sparc64/conf/GENERIC
==============================================================================
--- head/sys/sparc64/conf/GENERIC	Fri May 17 15:23:34 2019	(r347915)
+++ head/sys/sparc64/conf/GENERIC	Fri May 17 15:23:43 2019	(r347916)
@@ -203,7 +203,6 @@ device		hme		# Sun HME (Happy Meal Ethernet)
 device		nge		# NatSemi DP83820 gigabit Ethernet
 device		re		# RealTek 8139C+/8169/8169S/8110S
 device		rl		# RealTek 8129/8139
-device		sf		# Adaptec AIC-6915 (``Starfire'')
 device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
 device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
 device		ste		# Sundance ST201 (D-Link DFE-550TX)
