Module Name: src
Committed By: maxv
Date: Wed Dec 12 07:04:06 UTC 2018
Modified Files:
src/distrib/sets/lists/base: mi rescue.mi
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/man: mi
src/share/man/man4: Makefile pci.4
src/sys/dev: DEVNAMES
src/sys/dev/pci: Makefile files.pci
src/usr.sbin: Makefile
Removed Files:
src/share/man/man4: lmc.4
src/sys/dev/pci: if_lmc.c if_lmc.h
src/usr.sbin/lmcconfig: Makefile lmcconfig.8 lmcconfig.c
Log Message:
Retire the LMC driver, and its associated lmcconfig tool. LMC has been
mentioned repeatedly as a non-MP-safe driver that is hard to maintain,
and no one is taking care of it.
LMC was removed from OpenBSD three years ago, and from FreeBSD a few
months ago.
To generate a diff of this commit:
cvs rdiff -u -r1.1193 -r1.1194 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/base/rescue.mi
cvs rdiff -u -r1.2240 -r1.2241 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.269 -r1.270 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.1630 -r1.1631 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.674 -r1.675 src/share/man/man4/Makefile
cvs rdiff -u -r1.22 -r0 src/share/man/man4/lmc.4
cvs rdiff -u -r1.98 -r1.99 src/share/man/man4/pci.4
cvs rdiff -u -r1.318 -r1.319 src/sys/dev/DEVNAMES
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/Makefile
cvs rdiff -u -r1.411 -r1.412 src/sys/dev/pci/files.pci
cvs rdiff -u -r1.68 -r0 src/sys/dev/pci/if_lmc.c
cvs rdiff -u -r1.26 -r0 src/sys/dev/pci/if_lmc.h
cvs rdiff -u -r1.279 -r1.280 src/usr.sbin/Makefile
cvs rdiff -u -r1.2 -r0 src/usr.sbin/lmcconfig/Makefile
cvs rdiff -u -r1.7 -r0 src/usr.sbin/lmcconfig/lmcconfig.8
cvs rdiff -u -r1.12 -r0 src/usr.sbin/lmcconfig/lmcconfig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1193 src/distrib/sets/lists/base/mi:1.1194
--- src/distrib/sets/lists/base/mi:1.1193 Fri Nov 9 21:33:50 2018
+++ src/distrib/sets/lists/base/mi Wed Dec 12 07:04:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1193 2018/11/09 21:33:50 abs Exp $
+# $NetBSD: mi,v 1.1194 2018/12/12 07:04:05 maxv Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1762,7 +1762,7 @@
./usr/sbin/ldpd base-router-bin
./usr/sbin/link base-sysutil-bin
./usr/sbin/linkfarm base-obsolete obsolete
-./usr/sbin/lmcconfig base-netutil-bin
+./usr/sbin/lmcconfig base-obsolete obsolete
./usr/sbin/lmtp base-obsolete obsolete
./usr/sbin/lockstat base-sysutil-bin
./usr/sbin/lpc base-lpr-bin
Index: src/distrib/sets/lists/base/rescue.mi
diff -u src/distrib/sets/lists/base/rescue.mi:1.43 src/distrib/sets/lists/base/rescue.mi:1.44
--- src/distrib/sets/lists/base/rescue.mi:1.43 Sun Sep 23 07:24:19 2018
+++ src/distrib/sets/lists/base/rescue.mi Wed Dec 12 07:04:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: rescue.mi,v 1.43 2018/09/23 07:24:19 maxv Exp $
+# $NetBSD: rescue.mi,v 1.44 2018/12/12 07:04:05 maxv Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -67,7 +67,7 @@
./rescue/ldd base-rescue-root
./rescue/less base-rescue-root
./rescue/lfs_cleanerd base-rescue-root
-./rescue/lmcconfig base-rescue-root
+./rescue/lmcconfig base-obsolete obsolete
./rescue/lmcctl base-obsolete obsolete
./rescue/ln base-rescue-root
./rescue/ls base-rescue-root
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2240 src/distrib/sets/lists/comp/mi:1.2241
--- src/distrib/sets/lists/comp/mi:1.2240 Sat Dec 1 02:43:43 2018
+++ src/distrib/sets/lists/comp/mi Wed Dec 12 07:04:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2240 2018/12/01 02:43:43 kamil Exp $
+# $NetBSD: mi,v 1.2241 2018/12/12 07:04:05 maxv Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -643,7 +643,7 @@
./usr/include/dev/pci/if_fxpreg.h comp-obsolete obsolete
./usr/include/dev/pci/if_fxpvar.h comp-obsolete obsolete
./usr/include/dev/pci/if_levar.h comp-obsolete obsolete
-./usr/include/dev/pci/if_lmc.h comp-c-include
+./usr/include/dev/pci/if_lmc.h comp-obsolete obsolete
./usr/include/dev/pci/if_lmc_types.h comp-obsolete obsolete
./usr/include/dev/pci/if_lmcioctl.h comp-obsolete obsolete
./usr/include/dev/pci/if_lmcvar.h comp-obsolete obsolete
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.269 src/distrib/sets/lists/debug/mi:1.270
--- src/distrib/sets/lists/debug/mi:1.269 Mon Oct 1 08:23:53 2018
+++ src/distrib/sets/lists/debug/mi Wed Dec 12 07:04:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.269 2018/10/01 08:23:53 jmcneill Exp $
+# $NetBSD: mi,v 1.270 2018/12/12 07:04:05 maxv Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -1124,7 +1124,7 @@
./usr/libdata/debug/usr/sbin/lastlogin.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/ldpd.debug comp-router-debug debug
./usr/libdata/debug/usr/sbin/link.debug comp-sysutil-debug debug
-./usr/libdata/debug/usr/sbin/lmcconfig.debug comp-netutil-debug debug
+./usr/libdata/debug/usr/sbin/lmcconfig.debug comp-obsolete obsolete
./usr/libdata/debug/usr/sbin/lockstat.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/lpc.debug comp-lpr-debug debug
./usr/libdata/debug/usr/sbin/lpd.debug comp-lpr-debug debug
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1630 src/distrib/sets/lists/man/mi:1.1631
--- src/distrib/sets/lists/man/mi:1.1630 Sat Dec 8 01:47:21 2018
+++ src/distrib/sets/lists/man/mi Wed Dec 12 07:04:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1630 2018/12/08 01:47:21 sevan Exp $
+# $NetBSD: mi,v 1.1631 2018/12/12 07:04:05 maxv Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1386,7 +1386,7 @@
./usr/share/man/cat4/lii.0 man-sys-catman .cat
./usr/share/man/cat4/lkm.0 man-obsolete obsolete
./usr/share/man/cat4/lm.0 man-sys-catman .cat
-./usr/share/man/cat4/lmc.0 man-sys-catman .cat
+./usr/share/man/cat4/lmc.0 man-obsolete obsolete
./usr/share/man/cat4/lmenv.0 man-sys-catman .cat
./usr/share/man/cat4/lmtemp.0 man-sys-catman .cat
./usr/share/man/cat4/lo.0 man-sys-catman .cat
@@ -2671,7 +2671,7 @@
./usr/share/man/cat8/ldpd.0 man-router-catman .cat
./usr/share/man/cat8/lfs_cleanerd.0 man-sysutil-catman .cat
./usr/share/man/cat8/link.0 man-sysutil-catman .cat
-./usr/share/man/cat8/lmcconfig.0 man-sysutil-catman .cat
+./usr/share/man/cat8/lmcconfig.0 man-obsolete obsolete
./usr/share/man/cat8/lmcctl.0 man-obsolete obsolete
./usr/share/man/cat8/lmtp.0 man-postfix-catman postfix,.cat
./usr/share/man/cat8/local.0 man-postfix-catman postfix,.cat
@@ -4507,7 +4507,7 @@
./usr/share/man/html4/lii.html man-sys-htmlman html
./usr/share/man/html4/lkm.html man-obsolete obsolete
./usr/share/man/html4/lm.html man-sys-htmlman html
-./usr/share/man/html4/lmc.html man-sys-htmlman html
+./usr/share/man/html4/lmc.html man-obsolete obsolete
./usr/share/man/html4/lmenv.html man-sys-htmlman html
./usr/share/man/html4/lmtemp.html man-sys-htmlman html
./usr/share/man/html4/lo.html man-sys-htmlman html
@@ -5636,7 +5636,7 @@
./usr/share/man/html8/ldpd.html man-router-htmlman html
./usr/share/man/html8/lfs_cleanerd.html man-sysutil-htmlman html
./usr/share/man/html8/link.html man-sysutil-htmlman html
-./usr/share/man/html8/lmcconfig.html man-sysutil-htmlman html
+./usr/share/man/html8/lmcconfig.html man-obsolete obsolete
./usr/share/man/html8/lmtp.html man-postfix-htmlman postfix,html
./usr/share/man/html8/local.html man-postfix-htmlman postfix,html
./usr/share/man/html8/locate.updatedb.html man-sysutil-htmlman html
@@ -7468,7 +7468,7 @@
./usr/share/man/man4/lii.4 man-sys-man .man
./usr/share/man/man4/lkm.4 man-obsolete obsolete
./usr/share/man/man4/lm.4 man-sys-man .man
-./usr/share/man/man4/lmc.4 man-sys-man .man
+./usr/share/man/man4/lmc.4 man-obsolete obsolete
./usr/share/man/man4/lmenv.4 man-sys-man .man
./usr/share/man/man4/lmtemp.4 man-sys-man .man
./usr/share/man/man4/lo.4 man-sys-man .man
@@ -8753,7 +8753,7 @@
./usr/share/man/man8/ldpd.8 man-router-man .man
./usr/share/man/man8/lfs_cleanerd.8 man-sysutil-man .man
./usr/share/man/man8/link.8 man-sysutil-man .man
-./usr/share/man/man8/lmcconfig.8 man-sysutil-man .man
+./usr/share/man/man8/lmcconfig.8 man-obsolete obsolete
./usr/share/man/man8/lmcctl.8 man-obsolete obsolete
./usr/share/man/man8/lmtp.8 man-postfix-man postfix,.man
./usr/share/man/man8/local.8 man-postfix-man postfix,.man
Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.674 src/share/man/man4/Makefile:1.675
--- src/share/man/man4/Makefile:1.674 Sat Dec 1 11:17:28 2018
+++ src/share/man/man4/Makefile Wed Dec 12 07:04:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.674 2018/12/01 11:17:28 jdolecek Exp $
+# $NetBSD: Makefile,v 1.675 2018/12/12 07:04:05 maxv Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -105,7 +105,7 @@ MAN+= eisa.4 gpioiic.4 isa.4 isapnp.4 of
MAN+= podulebus.4 ieee1394if.4 spi.4
# machine-independent PCI devices
-MAN+= cz.4 epic.4 lmc.4 viaenv.4
+MAN+= cz.4 epic.4 viaenv.4
# machine-independent ISA devices
MAN+= aha.4 ai.4 aic.4 ast.4 ate.4 boca.4 cs.4 cy.4 ec.4 ef.4 \
Index: src/share/man/man4/pci.4
diff -u src/share/man/man4/pci.4:1.98 src/share/man/man4/pci.4:1.99
--- src/share/man/man4/pci.4:1.98 Thu Sep 6 09:47:30 2018
+++ src/share/man/man4/pci.4 Wed Dec 12 07:04:05 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: pci.4,v 1.98 2018/09/06 09:47:30 maxv Exp $
+.\" $NetBSD: pci.4,v 1.99 2018/12/12 07:04:05 maxv Exp $
.\"
.\" Copyright (c) 1997 Jason R. Thorpe. All rights reserved.
.\" Copyright (c) 1997 Jonathan Stone
@@ -29,7 +29,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd September 6, 2018
+.Dd December 12, 2018
.Dt PCI 4
.Os
.Sh NAME
@@ -264,8 +264,6 @@ interfaces.
Note, the
.Xr pcn 4
driver supersedes this driver.
-.It lmc
-LAN Media Corp WAN interfaces.
.It msk
Marvell Yukon 2 based Gigabit
.Tn Ethernet
@@ -472,7 +470,6 @@ VGA graphics boards.
.Xr iop 4 ,
.Xr isp 4 ,
.Xr le 4 ,
-.Xr lmc 4 ,
.Xr mfi 4 ,
.Xr mlx 4 ,
.Xr mly 4 ,
Index: src/sys/dev/DEVNAMES
diff -u src/sys/dev/DEVNAMES:1.318 src/sys/dev/DEVNAMES:1.319
--- src/sys/dev/DEVNAMES:1.318 Sun Sep 23 09:21:03 2018
+++ src/sys/dev/DEVNAMES Wed Dec 12 07:04:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: DEVNAMES,v 1.318 2018/09/23 09:21:03 maxv Exp $
+# $NetBSD: DEVNAMES,v 1.319 2018/12/12 07:04:05 maxv Exp $
#
# This file contains all used device names and defined attributes in
# alphabetical order. New devices added to the system somewhere should first
@@ -748,7 +748,6 @@ lkkbd vax
lkms vax
lm MI
lm700x MI
-lmc MI
lmenv MI
lms bebox
lms i386
Index: src/sys/dev/pci/Makefile
diff -u src/sys/dev/pci/Makefile:1.14 src/sys/dev/pci/Makefile:1.15
--- src/sys/dev/pci/Makefile:1.14 Sat Mar 28 14:41:28 2015
+++ src/sys/dev/pci/Makefile Wed Dec 12 07:04:05 2018
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.14 2015/03/28 14:41:28 msaitoh Exp $
+# $NetBSD: Makefile,v 1.15 2018/12/12 07:04:05 maxv Exp $
# use 'make -f Makefile.pcidevs' to make pcidevs.h and pcidevs_data.h
INCSDIR= /usr/include/dev/pci
# Only install includes which are used by userland
-INCS= amrreg.h amrio.h if_lmc.h mlyio.h mlyreg.h \
+INCS= amrreg.h amrio.h mlyio.h mlyreg.h \
pcidevs.h pcidevs_data.h pciio.h pcireg.h \
tgareg.h twereg.h tweio.h
Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.411 src/sys/dev/pci/files.pci:1.412
--- src/sys/dev/pci/files.pci:1.411 Fri Dec 7 09:36:26 2018
+++ src/sys/dev/pci/files.pci Wed Dec 12 07:04:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.411 2018/12/07 09:36:26 msaitoh Exp $
+# $NetBSD: files.pci,v 1.412 2018/12/12 07:04:05 maxv Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -426,11 +426,6 @@ file dev/pci/if_tl.c tl
attach ntwoc at pci with ntwoc_pci
file dev/pci/if_ntwoc_pci.c ntwoc_pci
-# Lan Media Corporation T1/HSSI/DS3 driver
-device lmc: ifnet, sppp
-attach lmc at pci
-file dev/pci/if_lmc.c lmc
-
# Essential Communications HIPPI interface
# device declaration in sys/conf/files
attach esh at pci with esh_pci
Index: src/usr.sbin/Makefile
diff -u src/usr.sbin/Makefile:1.279 src/usr.sbin/Makefile:1.280
--- src/usr.sbin/Makefile:1.279 Sun Sep 23 07:24:20 2018
+++ src/usr.sbin/Makefile Wed Dec 12 07:04:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.279 2018/09/23 07:24:20 maxv Exp $
+# $NetBSD: Makefile,v 1.280 2018/12/12 07:04:06 maxv Exp $
# from: @(#)Makefile 5.20 (Berkeley) 6/12/93
.include <bsd.own.mk>
@@ -14,7 +14,7 @@ SUBDIR= ac accton acpitools altq apm apm
i2cscan ifwatchd inetd installboot intrctl iopctl iostat ipwctl irdaattach \
isibootd iteconfig iwictl \
kgmon \
- lastlogin ldpd link lmcconfig lockstat lpr \
+ lastlogin ldpd link lockstat lpr \
mailwrapper makefs map-mbone mdconfig memswitch mlxctl mmcformat \
mopd mountd moused mrinfo mrouted mscdlabel mtrace mtree \
ndbootd netgroup_mkdb nfsd \
