Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 May 2019 15:23:02 +0000 (UTC)
From:      Brooks Davis <brooks@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r347911 - in head: . share/man/man4 sys/amd64/conf sys/conf sys/dev/ed sys/i386/conf sys/modules sys/modules/ed
Message-ID:  <201905171523.x4HFN2Pw005854@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brooks
Date: Fri May 17 15:23:02 2019
New Revision: 347911
URL: https://svnweb.freebsd.org/changeset/base/347911

Log:
  FCP-101: Remove ed(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/ed.4
  head/sys/dev/ed/
  head/sys/modules/ed/
Modified:
  head/ObsoleteFiles.inc
  head/share/man/man4/Makefile
  head/sys/amd64/conf/NOTES
  head/sys/conf/files
  head/sys/i386/conf/GENERIC
  head/sys/i386/conf/NOTES
  head/sys/modules/Makefile

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Fri May 17 15:22:54 2019	(r347910)
+++ head/ObsoleteFiles.inc	Fri May 17 15:23:02 2019	(r347911)
@@ -43,6 +43,8 @@ OLD_FILES+=usr/share/man/man4/bm.4
 OLD_FILES+=usr/share/man/man4/cs.4
 OLD_FILES+=usr/share/man/man4/de.4
 OLD_FILES+=usr/share/man/man4/if_de.4
+OLD_FILES+=usr/share/man/man4/ed.4
+OLD_FILES+=usr/share/man/man4/if_ed.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:22:54 2019	(r347910)
+++ head/share/man/man4/Makefile	Fri May 17 15:23:02 2019	(r347911)
@@ -136,7 +136,6 @@ MAN=	aac.4 \
 	ds3231.4 \
 	${_dtrace_provs} \
 	dummynet.4 \
-	ed.4 \
 	edsc.4 \
 	ehci.4 \
 	em.4 \
@@ -627,7 +626,6 @@ MLINKS+=cxgbev.4 if_cxgbev.4 \
 	cxgbev.4 if_ccv.4
 MLINKS+=dc.4 if_dc.4
 MLINKS+=disc.4 if_disc.4
-MLINKS+=ed.4 if_ed.4
 MLINKS+=edsc.4 if_edsc.4
 MLINKS+=em.4 if_em.4
 MLINKS+=enc.4 if_enc.4

Modified: head/sys/amd64/conf/NOTES
==============================================================================
--- head/sys/amd64/conf/NOTES	Fri May 17 15:22:54 2019	(r347910)
+++ head/sys/amd64/conf/NOTES	Fri May 17 15:23:02 2019	(r347911)
@@ -292,9 +292,6 @@ device		cpufreq
 
 # bxe:  Broadcom NetXtreme II (BCM5771X/BCM578XX) PCIe 10Gb Ethernet
 #       adapters.
-# ed:   Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503
-#       HP PC Lan+, various PC Card devices
-#       (requires miibus)
 # ipw:	Intel PRO/Wireless 2100 IEEE 802.11 adapter
 #	Requires the ipw firmware module
 # iwi:	Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters
@@ -312,7 +309,6 @@ device		cpufreq
 #	Requires the wpi firmware module
 
 device		bxe		# Broadcom NetXtreme II BCM5771X/BCM578XX 10GbE
-device		ed		# NE[12]000, SMC Ultra, 3c503, DS8390 cards
 options 	ED_3C503
 options 	ED_HPP
 options 	ED_SIC

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Fri May 17 15:22:54 2019	(r347910)
+++ head/sys/conf/files	Fri May 17 15:23:02 2019	(r347911)
@@ -1583,11 +1583,6 @@ dev/drm2/ttm/ttm_execbuf_util.c	optional drm2
 dev/drm2/ttm/ttm_memory.c	optional drm2
 dev/drm2/ttm/ttm_page_alloc.c	optional drm2
 dev/drm2/ttm/ttm_bo_vm.c	optional drm2
-dev/ed/if_ed.c			optional ed
-dev/ed/if_ed_novell.c		optional ed
-dev/ed/if_ed_rtl80x9.c		optional ed
-dev/ed/if_ed_pccard.c		optional ed pccard
-dev/ed/if_ed_pci.c		optional ed pci
 dev/efidev/efidev.c		optional efirt
 dev/efidev/efirt.c		optional efirt
 dev/efidev/efirtc.c		optional efirt

Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC	Fri May 17 15:22:54 2019	(r347910)
+++ head/sys/i386/conf/GENERIC	Fri May 17 15:23:02 2019	(r347911)
@@ -271,8 +271,6 @@ device		wb			# Winbond W89C840F
 device		xl			# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 
 # ISA Ethernet NICs.  pccard NICs included.
-# 'device ed' requires 'device miibus'
-device		ed			# NE[12]000, SMC Ultra, 3c503, DS8390 cards
 device		ex			# Intel EtherExpress Pro/10 and Pro/10+
 device		ep			# Etherlink III based cards
 device		fe			# Fujitsu MB8696x based cards

Modified: head/sys/i386/conf/NOTES
==============================================================================
--- head/sys/i386/conf/NOTES	Fri May 17 15:22:54 2019	(r347910)
+++ head/sys/i386/conf/NOTES	Fri May 17 15:23:02 2019	(r347911)
@@ -505,9 +505,6 @@ device		cpufreq
 # 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)
-# ed:   Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503
-#       HP PC Lan+, various PC Card devices
-#       (requires miibus)
 # 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
@@ -536,7 +533,6 @@ 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)
-device		ed		# NE[12]000, SMC Ultra, 3c503, DS8390 cards
 options 	ED_3C503
 options 	ED_HPP
 options 	ED_SIC

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Fri May 17 15:22:54 2019	(r347910)
+++ head/sys/modules/Makefile	Fri May 17 15:23:02 2019	(r347911)
@@ -107,7 +107,6 @@ SUBDIR=	\
 	dcons_crom \
 	${_dpms} \
 	dummynet \
-	${_ed} \
 	${_efirt} \
 	${_em} \
 	${_ena} \
@@ -599,7 +598,6 @@ _cbb=		cbb
 _cpuctl=	cpuctl
 _cpufreq=	cpufreq
 _dpms=		dpms
-_ed=		ed
 _em=		em
 _ep=		ep
 _et=		et



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905171523.x4HFN2Pw005854>