Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Remove Token Ring support.
details: https://anonhg.NetBSD.org/src/rev/e3b8e919bfba
branches: trunk
changeset: 848179:e3b8e919bfba
user: thorpej <thorpej%NetBSD.org@localhost>
date: Sun Jan 19 20:00:35 2020 +0000
description:
Remove Token Ring support.
diffstat:
distrib/sets/lists/comp/mi | 4 +-
distrib/sets/lists/man/mi | 8 +-
share/man/man4/Makefile | 4 +-
share/man/man4/tr.4 | 112 --
sys/arch/amd64/conf/ALL | 9 +-
sys/arch/amd64/conf/GENERIC | 6 +-
sys/arch/evbarm/conf/LUBBOCK | 1 -
sys/arch/evbarm/conf/MPCSA_GENERIC | 6 +-
sys/arch/evbarm/conf/TWINTAIL | 4 +-
sys/arch/evbppc/conf/OPENBLOCKS266_OPT | 4 +-
sys/arch/i386/conf/ALL | 11 +-
sys/arch/i386/conf/GENERIC | 11 +-
sys/arch/i386/conf/GENERIC_PS2TINY | 3 +-
sys/arch/i386/conf/INSTALL_FLOPPY | 6 +-
sys/arch/sparc64/conf/GENERIC | 6 +-
sys/conf/files | 11 +-
sys/dev/ic/tropic.c | 1744 --------------------------------
sys/dev/ic/tropicreg.h | 555 ----------
sys/dev/ic/tropicvar.h | 117 --
sys/dev/isa/files.isa | 9 +-
sys/dev/isa/if_tr_isa.c | 266 ----
sys/dev/isa/if_tribm_isa.c | 189 ---
sys/dev/isa/if_trtcm_isa.c | 356 ------
sys/dev/isapnp/files.isapnp | 6 +-
sys/dev/isapnp/if_tr_isapnp.c | 138 --
sys/dev/mca/files.mca | 6 +-
sys/dev/mca/if_tr_mca.c | 227 ----
sys/dev/pcmcia/files.pcmcia | 6 +-
sys/dev/pcmcia/if_tr_pcmcia.c | 333 ------
sys/net/Makefile | 4 +-
sys/net/files.net | 5 +-
sys/net/if.c | 7 +-
sys/net/if_token.h | 127 --
sys/net/if_tokensubr.c | 526 ---------
sys/netinet/if_arp.c | 54 +-
sys/netinet/ip_carp.c | 7 +-
36 files changed, 43 insertions(+), 4845 deletions(-)
diffs (truncated from 5459 to 300 lines):
diff -r c22faedc6b09 -r e3b8e919bfba distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi Sun Jan 19 19:50:54 2020 +0000
+++ b/distrib/sets/lists/comp/mi Sun Jan 19 20:00:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2302 2020/01/19 10:50:25 martin Exp $
+# $NetBSD: mi,v 1.2303 2020/01/19 20:00:36 thorpej Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -2366,7 +2366,7 @@
./usr/include/net/if_stf.h comp-c-include
./usr/include/net/if_stripvar.h comp-obsolete obsolete
./usr/include/net/if_tap.h comp-c-include
-./usr/include/net/if_token.h comp-c-include
+./usr/include/net/if_token.h comp-obsolete obsolete
./usr/include/net/if_tun.h comp-c-include
./usr/include/net/if_types.h comp-c-include
./usr/include/net/if_vlanvar.h comp-c-include
diff -r c22faedc6b09 -r e3b8e919bfba distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Sun Jan 19 19:50:54 2020 +0000
+++ b/distrib/sets/lists/man/mi Sun Jan 19 20:00:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1672 2020/01/19 17:53:15 thorpej Exp $
+# $NetBSD: mi,v 1.1673 2020/01/19 20:00:36 thorpej Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1845,7 +1845,7 @@
./usr/share/man/cat4/tprof.0 man-sys-catman .cat
./usr/share/man/cat4/tps65217pmic.0 man-sys-catman .cat
./usr/share/man/cat4/tqphy.0 man-sys-catman .cat
-./usr/share/man/cat4/tr.0 man-sys-catman .cat
+./usr/share/man/cat4/tr.0 man-obsolete obsolete
./usr/share/man/cat4/tra.0 man-sys-catman .cat
./usr/share/man/cat4/trm.0 man-sys-catman .cat
./usr/share/man/cat4/tsllux.0 man-sys-catman .cat
@@ -4955,7 +4955,7 @@
./usr/share/man/html4/tprof.html man-sys-htmlman html
./usr/share/man/html4/tps65217pmic.html man-sys-htmlman html
./usr/share/man/html4/tqphy.html man-sys-htmlman html
-./usr/share/man/html4/tr.html man-sys-htmlman html
+./usr/share/man/html4/tr.html man-obsolete obsolete
./usr/share/man/html4/tra.html man-sys-htmlman html
./usr/share/man/html4/trm.html man-sys-htmlman html
./usr/share/man/html4/tsllux.html man-sys-htmlman html
@@ -7985,7 +7985,7 @@
./usr/share/man/man4/tprof.4 man-sys-man .man
./usr/share/man/man4/tps65217pmic.4 man-sys-man .man
./usr/share/man/man4/tqphy.4 man-sys-man .man
-./usr/share/man/man4/tr.4 man-sys-man .man
+./usr/share/man/man4/tr.4 man-obsolete obsolete
./usr/share/man/man4/tra.4 man-sys-man .man
./usr/share/man/man4/trm.4 man-sys-man .man
./usr/share/man/man4/tsllux.4 man-sys-man .man
diff -r c22faedc6b09 -r e3b8e919bfba share/man/man4/Makefile
--- a/share/man/man4/Makefile Sun Jan 19 19:50:54 2020 +0000
+++ b/share/man/man4/Makefile Sun Jan 19 20:00:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.696 2020/01/19 17:53:15 thorpej Exp $
+# $NetBSD: Makefile,v 1.697 2020/01/19 20:00:35 thorpej Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -63,7 +63,7 @@
ssdfb.4 st.4 ste.4 stge.4 sti.4 stpcide.4 sv.4 \
svwsata.4 swsensor.4 swwdog.4 sysmon.4 \
tap.4 tc.4 tcds.4 tcp.4 tcu.4 tdvfb.4 tea5767radio.4 termios.4 tfb.4 \
- thinkpad.4 ti.4 tl.4 tlp.4 tlphy.4 tpm.4 tprof.4 tr.4 tra.4 \
+ thinkpad.4 ti.4 tl.4 tlp.4 tlphy.4 tpm.4 tprof.4 tra.4 \
trm.4 tsllux.4 tty.4 tun.4 tqphy.4 twa.4 twe.4 txp.4 \
uark.4 ubsec.4 udp.4 uep.4 ug.4 uha.4 uk.4 ukphy.4 umb.4 \
unix.4 userconf.4 \
diff -r c22faedc6b09 -r e3b8e919bfba share/man/man4/tr.4
--- a/share/man/man4/tr.4 Sun Jan 19 19:50:54 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-.\" $NetBSD: tr.4,v 1.15 2008/04/30 13:10:54 martin Exp $
-.\"
-.\" Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Christoph Badura.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (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 April 14, 1999
-.Dt TR 4
-.Os
-.Sh NAME
-.Nm tr
-.Nd TROPIC based shared memory Token-Ring cards device driver
-.Sh SYNOPSIS
-.Cd "tr0 at isa? port 0xa20 iomem 0xd800 irq ?"
-.Cd "tr* at isa? port ? irq ?"
-.Cd "tr* at isapnp?"
-.Cd "tr* at mca? slot ?"
-.Cd "tr* at pcmcia? function ?"
-.Sh DESCRIPTION
-The
-.Nm
-device driver supports TROPIC I based shared-memory Token-Ring cards.
-.Sh HARDWARE
-Supported cards include the following IBM and 3Com models:
-.Pp
-.Bl -tag -width xxxx -offset indent
-.It IBM
-Token-Ring Network PC Adapter
-.It IBM
-Token-Ring Network PC Adapter II
-.It IBM
-Token-Ring Network Adapter/A
-.It IBM
-Token-Ring Network 16/4 Adapter
-.It IBM
-Token-Ring Network 16/4 Adapter/A
-.It IBM
-Token-Ring 16/4 Credit Card Adapter
-.It IBM
-Token Ring Auto 16/4 Credit Card Adapter
-.It IBM
-Turbo 16/4 Token Ring PC Card
-.It IBM
-16/4 ISA Adapter
-.It IBM
-Auto 16/4 Token-Ring ISA Adapter
-.It IBM
-Token Ring 16/4 Credit Card Adapter
-.It IBM
-Token Ring Auto 16/4 Credit Card Adapter
-.It IBM
-Turbo 16/4 Token Ring PC Card
-.It 3Com
-3C619 TokenLink
-.It 3Com
-3C319 TokenLink Velocity
-.It 3Com
-3C389 TokenLink Velocity PC Card
-.El
-.Sh SOURCE ROUTING
-Setting IFF_LINK0 enables Token-Ring source routing. Setting
-IFF_LINK1 uses all-routes broadcasts otherwise single-route broadcasts
-are used.
-.Sh NOTES
-The MCA attachment has been only tested on
-IBM Token Ring 16/4 Adapter/A so far.
-It doesn't support
-.Xr ifmedia 4
-yet, too.
-.\".Sh MEDIA SELECTION
-.\".Sh DIAGNOSTICS
-.Sh SEE ALSO
-.Xr ifmedia 4 ,
-.Xr intro 4 ,
-.Xr isa 4 ,
-.Xr isapnp 4 ,
-.Xr mca 4 ,
-.Xr pcmcia 4 ,
-.Xr ifconfig 8
-.Sh HISTORY
-The
-.Nm
-driver
-appeared in
-.Nx 1.4 .
-.Sh BUGS
-The PCMCIA attachment does not work with the
-.Xr cbb 4
-CardBus driver.
diff -r c22faedc6b09 -r e3b8e919bfba sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL Sun Jan 19 19:50:54 2020 +0000
+++ b/sys/arch/amd64/conf/ALL Sun Jan 19 20:00:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.138 2020/01/19 06:55:22 thorpej Exp $
+# $NetBSD: ALL,v 1.139 2020/01/19 20:00:37 thorpej Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.138 $"
+#ident "ALL-$Revision: 1.139 $"
maxusers 64 # estimated number of users
@@ -1036,8 +1036,6 @@
ne* at pcmcia? function ? # NE2000-compatible Ethernet
ray* at pcmcia? function ? # Raytheon Raylink (802.11)
sm* at pcmcia? function ? # Megahertz Ethernet
-# tr at pcmcia has problems with Cardbus bridges
-tr* at pcmcia? function ? # TROPIC based Token-Ring
wi* at pcmcia? function ? # Lucent/Intersil WaveLAN/IEEE (802.11)
xirc* at pcmcia? function ? # Xircom CreditCard Ethernet
com* at xirc?
@@ -1069,9 +1067,6 @@
ne0 at isa? port 0x280 irq 9 # NE[12]000 Ethernet cards
ne1 at isa? port 0x300 irq 10
sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
-tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring
-tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring
-tr* at isa? port ? irq ? # 3Com TROPIC based Token-Ring
we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
we1 at isa? port 0x300 iomem 0xcc000 irq 10
diff -r c22faedc6b09 -r e3b8e919bfba sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC Sun Jan 19 19:50:54 2020 +0000
+++ b/sys/arch/amd64/conf/GENERIC Sun Jan 19 20:00:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.556 2020/01/19 06:55:22 thorpej Exp $
+# $NetBSD: GENERIC,v 1.557 2020/01/19 20:00:37 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.556 $"
+#ident "GENERIC-$Revision: 1.557 $"
maxusers 64 # estimated number of users
@@ -852,8 +852,6 @@
ne* at pcmcia? function ? # NE2000-compatible Ethernet
ray* at pcmcia? function ? # Raytheon Raylink (802.11)
sm* at pcmcia? function ? # Megahertz Ethernet
-# tr at pcmcia has problems with Cardbus bridges
-#tr* at pcmcia? function ? # TROPIC based Token-Ring
wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
xirc* at pcmcia? function ? # Xircom CreditCard Ethernet
com* at xirc?
diff -r c22faedc6b09 -r e3b8e919bfba sys/arch/evbarm/conf/LUBBOCK
--- a/sys/arch/evbarm/conf/LUBBOCK Sun Jan 19 19:50:54 2020 +0000
+++ b/sys/arch/evbarm/conf/LUBBOCK Sun Jan 19 20:00:35 2020 +0000
@@ -213,7 +213,6 @@
ne* at pcmcia? function ? # NE2000-compatible Ethernet
ray* at pcmcia? function ? # Raytheon Raylink (802.11)
sm* at pcmcia? function ? # Megahertz Ethernet
-tr* at pcmcia? function ? # TROPIC based Token-Ring
wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
xirc* at pcmcia? function ? # Xircom CreditCard Ethernet
com* at xirc?
diff -r c22faedc6b09 -r e3b8e919bfba sys/arch/evbarm/conf/MPCSA_GENERIC
--- a/sys/arch/evbarm/conf/MPCSA_GENERIC Sun Jan 19 19:50:54 2020 +0000
+++ b/sys/arch/evbarm/conf/MPCSA_GENERIC Sun Jan 19 20:00:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MPCSA_GENERIC,v 1.68 2020/01/19 01:25:04 thorpej Exp $
+# $NetBSD: MPCSA_GENERIC,v 1.69 2020/01/19 20:00:37 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.68 $"
+#ident "GENERIC-$Revision: 1.69 $"
maxusers 32 # estimated number of users
@@ -370,8 +370,6 @@
#ne* at pcmcia? function ? # NE2000-compatible Ethernet
#ray* at pcmcia? function ? # Raytheon Raylink (802.11)
#sm* at pcmcia? function ? # Megahertz Ethernet
-# tr at pcmcia has problems with Cardbus bridges
-#tr* at pcmcia? function ? # TROPIC based Token-Ring
wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
#xirc* at pcmcia? function ? # Xircom CreditCard Ethernet
#com* at xirc?
diff -r c22faedc6b09 -r e3b8e919bfba sys/arch/evbarm/conf/TWINTAIL
--- a/sys/arch/evbarm/conf/TWINTAIL Sun Jan 19 19:50:54 2020 +0000
+++ b/sys/arch/evbarm/conf/TWINTAIL Sun Jan 19 20:00:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: TWINTAIL,v 1.76 2020/01/19 01:25:05 thorpej Exp $
+# $NetBSD: TWINTAIL,v 1.77 2020/01/19 20:00:37 thorpej Exp $
#
# TWINTAIL -- Genetec corp. G4255EB-X002 Evaluation Board Kernel
#
@@ -325,8 +325,6 @@
Home |
Main Index |
Thread Index |
Old Index