World, I'd like you to meet the first FreeBSD token Ring driver.

This  is for various Olicom cards. An IBM driver is following.
This patch also adds support to tcpdump to decode packets on tokenring.
Congratulations to the proud father.. (below)

Submitted by:	Larry Lile <lile@stdio.com>

3 files changed, 30 insertions, 4 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 35b07c31a631..1912ebb504bd 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.554 1999/02/13 17:54:32 nsouch Exp $
+#	$Id: LINT,v 1.555 1999/02/14 12:00:00 nsouch Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -383,7 +383,7 @@ options		NETATALK		#Appletalk communications protocols
 #  The `loop' pseudo-device is MANDATORY when networking is enabled.
 #  The `ether' pseudo-device provides generic code to handle
 #  Ethernets; it is MANDATORY when a Ethernet device driver is
-#  configured.
+#  configured or token-ring is enabled.
 #  The 'fddi' pseudo-device provides generic code to support FDDI.
 #  The `sppp' pseudo-device serves a similar role for certain types
 #  of synchronous PPP links (like `cx', `ar').
@@ -406,6 +406,7 @@ options		NETATALK		#Appletalk communications protocols
 # See pppd(8) for more details.
 #
 pseudo-device	ether			#Generic Ethernet
+pseudo-device	token			#Generic TokenRing
 pseudo-device	fddi			#Generic FDDI
 pseudo-device	sppp			#Generic Synchronous PPP
 pseudo-device	loop			#Network loopback device
@@ -1177,8 +1178,9 @@ options		"EXTRA_SIO=2"		#number of extra sio ports to allocate
 # zp: 3Com PCMCIA Etherlink III (It does not require shared memory for
 #     send/receive operation, but it needs 'iomem' to read/write the
 #     attribute memory)
+# oltr: Olicom ISA token-ring adapters OC-3115, OC-3117, OC-3118 and OC-3133 
+#       (no options needed)
 #
-
 device ar0 at isa? port 0x300 net irq 10 iomem 0xd0000
 device cs0 at isa? port 0x300 net irq ?
 device cx0 at isa? port 0x240 net irq 15 drq 7
@@ -1201,6 +1203,8 @@ device wl0 at isa? port 0x300 net irq ?
 device ze0 at isa? port 0x300 net irq 5 iomem 0xd8000
 device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000
 
+device oltr0 at isa?
+
 #
 # ATM related options
 #
@@ -1581,6 +1585,9 @@ options	"EISA_SLOTS=12"
 #
 # Using sysctl(8) run-time overrides on a per-card basis can be made
 #
+# The "oltr" driver supports the following Olicom PCI token-ring adapters
+# OC-3136, OC-3137, OC-3139, OC-3140, OC-3141, OC-3540, OC-3250
+#
 controller	pci0
 controller	ahc1
 controller	ncr0
@@ -1623,6 +1630,7 @@ device		wb0
 device		xl0
 device		fpa0
 device		meteor0
+device		oltr0
 
 # Brooktree driver has been ported to the new I2C framework. Thus,
 # you'll need at least iicbus, iicbb and smbus. iic/smb are only needed if you
diff --git a/sys/conf/files b/sys/conf/files
index 2fd1201a7d36..ec5c38479ed6 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -393,6 +393,7 @@ net/if.c		standard
 net/if_atmsubr.c	optional atm
 net/if_disc.c		optional disc
 net/if_ethersubr.c	optional ether
+net/if_iso88025subr.c	optional token
 net/if_fddisubr.c	optional fddi
 net/if_loop.c		optional loop
 net/if_media.c		standard
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index df4acc3ee255..8ed556251811 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.221 1999/02/10 02:41:23 des Exp $
+#	$Id: files.i386,v 1.222 1999/02/11 07:11:00 gibbs Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -139,6 +139,23 @@ i386/isa/if_sr.c		optional	sr	device-driver
 i386/isa/if_wl.c		optional	wl	device-driver
 i386/isa/if_ze.c		optional	ze	device-driver
 i386/isa/if_zp.c		optional	zp	device-driver
+dev/oltr/if_oltr.c		optional	oltr	device-driver
+dev/oltr/trlld.o		optional	oltr	device-driver	\
+	dependency	"$S/$@.uu"					\
+	compile-with	"uudecode < $S/$@.uu"				\
+	no-implicit-rule before-depend
+dev/oltr/trlldmac.o		optional	oltr	device-driver	\
+	dependency	"$S/$@.uu"					\
+	compile-with	"uudecode < $S/$@.uu"				\
+	no-implicit-rule before-depend
+dev/oltr/trlldhm.o		optional	oltr	device-driver	\
+	dependency	"$S/$@.uu"					\
+	compile-with	"uudecode < $S/$@.uu"				\
+	no-implicit-rule before-depend
+dev/oltr/trlldbm.o		optional	oltr	device-driver	\
+	dependency	"$S/$@.uu"					\
+	compile-with	"uudecode < $S/$@.uu"				\
+	no-implicit-rule before-depend
 i386/isa/ipl_funcs.c		standard				   \
 	compile-with	"${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} $<"
 i386/isa/intr_machdep.c		standard