Add entries for Comtrol Rocketport serial card.

Submitted by:	Amir Farah <amir@comtrol.com>

7 files changed, 107 insertions, 9 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index d5566f1..9bb9dd8 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.357 1997/08/14 14:03:25 msmith Exp $
+#	$Id: LINT,v 1.358 1997/08/19 17:11:35 peter 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
@@ -990,6 +990,7 @@ device pca0 at isa? port IO_TIMER1 tty
 # joy: joystick
 # labpc: National Instrument's Lab-PC and Lab-PC+
 # rc: RISCom/8 multiport card
+# rp: Comtrol Rocketport(ISA) - single card
 # tw: TW-523 power line interface for use with X-10 home control products
 # si: Specialix SI/XIO 4-32 port terminal multiplexor
 # stl: Stallion EasyIO and EasyConnection 8/32 (cd1400 based)
@@ -1015,6 +1016,36 @@ device pca0 at isa? port IO_TIMER1 tty
 #  	options SPIGOT_UNSECURE
 #
 
+# Notes on the Comtrol Rocketport driver:
+#
+# The exact values used for rp0 depend on how many boards you have
+# in the system.  The manufacturer's sample configs are listed as:
+#
+#   Comtrol Rocketport ISA single card
+#               device  rp0     at isa? port 0x280 tty
+#
+#   If instead you have two ISA cards, one installed at 0x100 and the
+#   second installed at 0x180, then you should add the following to
+#   your kernel configuration file:
+#
+#               device  rp0     at isa? port 0x100 tty
+#               device  rp1     at isa? port 0x180 tty
+#
+#   For 4 ISA cards, it might be something like this:
+#
+#               device  rp0     at isa? port 0x180 tty
+#               device  rp1     at isa? port 0x100 tty
+#               device  rp2     at isa? port 0x340 tty
+#               device  rp3     at isa? port 0x240 tty
+#
+#   And for PCI cards, you only need say:
+#
+#               device rp0
+#               device rp1
+#               ...
+#   Note: Make sure that any Rocketport PCI devices are specified BEFORE the
+#   ISA Rocketport devices.
+
 # Notes on the Digiboard driver:
 #
 # The following flag values have special meanings:
@@ -1060,6 +1091,7 @@ device		cy0	at isa? tty irq 10 iomem 0xd4000 iosiz 0x2000 vector cyintr
 device		dgb0	at isa? port 0x220 iomem 0xfc0000 iosiz ? tty
 device		labpc0	at isa? port 0x260 tty irq 5 vector labpcintr
 device          rc0     at isa? port 0x220 tty irq 12 vector rcintr
+device          rp0     at isa? port 0x280 tty
 # the port and irq for tw0 are fictitious
 device          tw0     at isa? port 0x380 tty irq 11 vector twintr
 device		si0	at isa? iomem 0xd0000 tty irq 12 vector siintr
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 10f82e3..9d7f07d 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.170 1997/08/01 06:04:34 msmith Exp $
+#	$Id: files.i386,v 1.171 1997/08/14 14:03:27 msmith Exp $
 #
 aic7xxx_asm			optional	ahc	device-driver	   \
 	dependency 	"$S/dev/aic7xxx/*.[chyl]"			   \
@@ -165,6 +165,7 @@ i386/isa/qcam.c			optional	qcam	device-driver
 i386/isa/qcamio.c		optional	qcam	device-driver
 i386/isa/random_machdep.c	standard
 i386/isa/rc.c			optional	rc	device-driver
+i386/isa/rp.c			optional	rp	device-driver
 i386/isa/scd.c			optional	scd	device-driver
 i386/isa/seagate.c		optional	sea	device-driver
 i386/isa/si.c			optional	si	device-driver
diff --git a/sys/conf/majors b/sys/conf/majors
index 21587f6..7437cfa 100644
--- a/sys/conf/majors
+++ b/sys/conf/majors
@@ -1,4 +1,4 @@
-$Id: majors.i386,v 1.15 1997/08/13 21:01:30 jkh Exp $
+$Id: majors.i386,v 1.16 1997/08/16 14:15:40 msmith Exp $
 
 Hopefully, this list will one day be obsoleted by DEVFS, but for now
 this is the current allocation of device major numbers.
@@ -119,5 +119,5 @@ chrdev	name		comments
 78	gd		Geometry disk
 79	ipl		IP Filter
 80	xdcp		Assigned to Chris Ficklin <chris@serengeti.com>
-81	??		RocketPort/Steve Gericke <steveg@comtrol.com>
+81	rp		RocketPort/Steve Gericke <steveg@comtrol.com>
 82	ppi		Generic Parallel I/O <Nicolas.Souchu@prism.uvsq.fr>
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index d5566f1..9bb9dd8 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -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.357 1997/08/14 14:03:25 msmith Exp $
+#	$Id: LINT,v 1.358 1997/08/19 17:11:35 peter 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
@@ -990,6 +990,7 @@ device pca0 at isa? port IO_TIMER1 tty
 # joy: joystick
 # labpc: National Instrument's Lab-PC and Lab-PC+
 # rc: RISCom/8 multiport card
+# rp: Comtrol Rocketport(ISA) - single card
 # tw: TW-523 power line interface for use with X-10 home control products
 # si: Specialix SI/XIO 4-32 port terminal multiplexor
 # stl: Stallion EasyIO and EasyConnection 8/32 (cd1400 based)
@@ -1015,6 +1016,36 @@ device pca0 at isa? port IO_TIMER1 tty
 #  	options SPIGOT_UNSECURE
 #
 
+# Notes on the Comtrol Rocketport driver:
+#
+# The exact values used for rp0 depend on how many boards you have
+# in the system.  The manufacturer's sample configs are listed as:
+#
+#   Comtrol Rocketport ISA single card
+#               device  rp0     at isa? port 0x280 tty
+#
+#   If instead you have two ISA cards, one installed at 0x100 and the
+#   second installed at 0x180, then you should add the following to
+#   your kernel configuration file:
+#
+#               device  rp0     at isa? port 0x100 tty
+#               device  rp1     at isa? port 0x180 tty
+#
+#   For 4 ISA cards, it might be something like this:
+#
+#               device  rp0     at isa? port 0x180 tty
+#               device  rp1     at isa? port 0x100 tty
+#               device  rp2     at isa? port 0x340 tty
+#               device  rp3     at isa? port 0x240 tty
+#
+#   And for PCI cards, you only need say:
+#
+#               device rp0
+#               device rp1
+#               ...
+#   Note: Make sure that any Rocketport PCI devices are specified BEFORE the
+#   ISA Rocketport devices.
+
 # Notes on the Digiboard driver:
 #
 # The following flag values have special meanings:
@@ -1060,6 +1091,7 @@ device		cy0	at isa? tty irq 10 iomem 0xd4000 iosiz 0x2000 vector cyintr
 device		dgb0	at isa? port 0x220 iomem 0xfc0000 iosiz ? tty
 device		labpc0	at isa? port 0x260 tty irq 5 vector labpcintr
 device          rc0     at isa? port 0x220 tty irq 12 vector rcintr
+device          rp0     at isa? port 0x280 tty
 # the port and irq for tw0 are fictitious
 device          tw0     at isa? port 0x380 tty irq 11 vector twintr
 device		si0	at isa? iomem 0xd0000 tty irq 12 vector siintr
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index d5566f1..9bb9dd8 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/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.357 1997/08/14 14:03:25 msmith Exp $
+#	$Id: LINT,v 1.358 1997/08/19 17:11:35 peter 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
@@ -990,6 +990,7 @@ device pca0 at isa? port IO_TIMER1 tty
 # joy: joystick
 # labpc: National Instrument's Lab-PC and Lab-PC+
 # rc: RISCom/8 multiport card
+# rp: Comtrol Rocketport(ISA) - single card
 # tw: TW-523 power line interface for use with X-10 home control products
 # si: Specialix SI/XIO 4-32 port terminal multiplexor
 # stl: Stallion EasyIO and EasyConnection 8/32 (cd1400 based)
@@ -1015,6 +1016,36 @@ device pca0 at isa? port IO_TIMER1 tty
 #  	options SPIGOT_UNSECURE
 #
 
+# Notes on the Comtrol Rocketport driver:
+#
+# The exact values used for rp0 depend on how many boards you have
+# in the system.  The manufacturer's sample configs are listed as:
+#
+#   Comtrol Rocketport ISA single card
+#               device  rp0     at isa? port 0x280 tty
+#
+#   If instead you have two ISA cards, one installed at 0x100 and the
+#   second installed at 0x180, then you should add the following to
+#   your kernel configuration file:
+#
+#               device  rp0     at isa? port 0x100 tty
+#               device  rp1     at isa? port 0x180 tty
+#
+#   For 4 ISA cards, it might be something like this:
+#
+#               device  rp0     at isa? port 0x180 tty
+#               device  rp1     at isa? port 0x100 tty
+#               device  rp2     at isa? port 0x340 tty
+#               device  rp3     at isa? port 0x240 tty
+#
+#   And for PCI cards, you only need say:
+#
+#               device rp0
+#               device rp1
+#               ...
+#   Note: Make sure that any Rocketport PCI devices are specified BEFORE the
+#   ISA Rocketport devices.
+
 # Notes on the Digiboard driver:
 #
 # The following flag values have special meanings:
@@ -1060,6 +1091,7 @@ device		cy0	at isa? tty irq 10 iomem 0xd4000 iosiz 0x2000 vector cyintr
 device		dgb0	at isa? port 0x220 iomem 0xfc0000 iosiz ? tty
 device		labpc0	at isa? port 0x260 tty irq 5 vector labpcintr
 device          rc0     at isa? port 0x220 tty irq 12 vector rcintr
+device          rp0     at isa? port 0x280 tty
 # the port and irq for tw0 are fictitious
 device          tw0     at isa? port 0x380 tty irq 11 vector twintr
 device		si0	at isa? iomem 0xd0000 tty irq 12 vector siintr
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index 10f82e3..9d7f07d 100644
--- a/sys/i386/conf/files.i386
+++ b/sys/i386/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.170 1997/08/01 06:04:34 msmith Exp $
+#	$Id: files.i386,v 1.171 1997/08/14 14:03:27 msmith Exp $
 #
 aic7xxx_asm			optional	ahc	device-driver	   \
 	dependency 	"$S/dev/aic7xxx/*.[chyl]"			   \
@@ -165,6 +165,7 @@ i386/isa/qcam.c			optional	qcam	device-driver
 i386/isa/qcamio.c		optional	qcam	device-driver
 i386/isa/random_machdep.c	standard
 i386/isa/rc.c			optional	rc	device-driver
+i386/isa/rp.c			optional	rp	device-driver
 i386/isa/scd.c			optional	scd	device-driver
 i386/isa/seagate.c		optional	sea	device-driver
 i386/isa/si.c			optional	si	device-driver
diff --git a/sys/i386/conf/majors.i386 b/sys/i386/conf/majors.i386
index 21587f6..7437cfa 100644
--- a/sys/i386/conf/majors.i386
+++ b/sys/i386/conf/majors.i386
@@ -1,4 +1,4 @@
-$Id: majors.i386,v 1.15 1997/08/13 21:01:30 jkh Exp $
+$Id: majors.i386,v 1.16 1997/08/16 14:15:40 msmith Exp $
 
 Hopefully, this list will one day be obsoleted by DEVFS, but for now
 this is the current allocation of device major numbers.
@@ -119,5 +119,5 @@ chrdev	name		comments
 78	gd		Geometry disk
 79	ipl		IP Filter
 80	xdcp		Assigned to Chris Ficklin <chris@serengeti.com>
-81	??		RocketPort/Steve Gericke <steveg@comtrol.com>
+81	rp		RocketPort/Steve Gericke <steveg@comtrol.com>
 82	ppi		Generic Parallel I/O <Nicolas.Souchu@prism.uvsq.fr>