Use the ``official'' description for the MVME3xx cards, and provide jumper

information for the 328S and 376. Also remove the media section for ethernet
drivers, which does not apply.

ok+tweaks paul@ jmc@

4 files changed, 77 insertions, 49 deletions

diff --git a/share/man/man4/man4.mvme88k/ie.4 b/share/man/man4/man4.mvme88k/ie.4
index f0cbc6ea986..d945fb8f1fc 100644
--- a/share/man/man4/man4.mvme88k/ie.4
+++ b/share/man/man4/man4.mvme88k/ie.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ie.4,v 1.2 2003/08/08 09:29:24 miod Exp $
+.\"	$OpenBSD: ie.4,v 1.3 2003/12/26 21:03:34 miod Exp $
 .\"
 .\" Copyright (c) 2003 Paul Weissmann
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd May 14, 2003
+.Dd December 26, 2003
 .Dt IE 4 mvme88k
 .Os
 .Sh NAME
@@ -61,24 +61,8 @@ The i82596CA chip is integrated on both the
 and
 .Tn MVME197
 Single-Board Computers.
-The available external connector depends on the P2 converter board.
-In most cases either a BNC or AUI connector is provided.
-.Pp
-By default, the system will select the media type automatically, but the
-.Xr ifconfig 8
-command can be used to force the media selection.
-The media types are shown below:
-.Bl -tag -width "media autoselect" -offset indent
-.It media autoselect
-Attempt to autoselect the media type (default)
-.It media 10base5
-Use the AUI connector
-.It media 10base2
-Use the BNC connector
-.El
 .Sh SEE ALSO
 .Xr arp 4 ,
-.Xr ifmedia 4 ,
 .Xr inet 4 ,
 .Xr intro 4 ,
 .Xr netintro 4 ,
diff --git a/share/man/man4/man4.mvme88k/intro.4 b/share/man/man4/man4.mvme88k/intro.4
index 5845aac0b29..6c7d879578c 100644
--- a/share/man/man4/man4.mvme88k/intro.4
+++ b/share/man/man4/man4.mvme88k/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.1 2003/08/07 19:22:38 miod Exp $
+.\"	$OpenBSD: intro.4,v 1.2 2003/12/26 21:03:34 miod Exp $
 .\" Copyright (c) 1990, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -112,13 +112,13 @@ NCR 53C710 low level SCSI adapter interface.
 .\" .It Xr syscon 4
 .\" MVME188 system controller.
 .It Xr ve 4
-AMD 7990/LANCE-based MVME376 VME board
+MVME376 Ethernet Communications Controller.
 .It Xr vme 4
 VMEchip2 VMEbus interface chip.
 .It Xr vs 4
-MVME328 low level SCSI adapter interface.
+MVME328S High Performance SCSI Controller.
 .\" .It Xr vx 4
-.\" MVME332 8-port serial board.
+.\" MVME332XT High Performance Serial I/O Controller.
 .El
 .Sh SEE ALSO
 .Xr autoconf 4 ,
diff --git a/share/man/man4/man4.mvme88k/ve.4 b/share/man/man4/man4.mvme88k/ve.4
index 6b46da84f05..ab6284793ee 100644
--- a/share/man/man4/man4.mvme88k/ve.4
+++ b/share/man/man4/man4.mvme88k/ve.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ve.4,v 1.2 2003/08/08 09:29:24 miod Exp $
+.\"	$OpenBSD: ve.4,v 1.3 2003/12/26 21:03:34 miod Exp $
 .\"
 .\" Copyright (c) 2003 Paul Weissmann
 .\" All rights reserved.
@@ -25,12 +25,12 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd May 14, 2003
+.Dd December 26, 2003
 .Dt VE 4 mvme88k
 .Os
 .Sh NAME
 .Nm ve
-.Nd MVME376 Ethernet I/O adapter
+.Nd MVME376 Ethernet Communications Controller
 .Sh SYNOPSIS
 .Cd "ve0 at vmes0 addr 0xffff1200 ipl 1 len 0x100"
 .Cd "ve1 at vmes0 addr 0xffff1400 ipl 1 len 0x100"
@@ -54,28 +54,40 @@ interface employs the address resolution protocol described in
 to dynamically map between Internet and
 .Tn Ethernet
 addresses on the local network.
+.Sh HARDWARE CONFIGURATION
+The card's base address
+.Po
+matching the
+.Em addr
+locator on the configuration line
+.Pc
+is defined through two sets of DIP switches,
+.Dq SW1
+and
+.Dq SW2 ,
+located in the middle of the board, near the space between the two
+VME connectors.
 .Pp
-Depending on the version of the board, the type of the Ethernet connector
-varies. In most cases either an BNC or AUI connector is provided.
-.Pp
-By default, the system will select the media type automatically, but the
-.Xr ifconfig 8
-command can be used to force the media selection.
-The media types are shown below:
-.Bl -tag -width "media autoselect" -offset indent
-.It media autoselect
-Attempt to autoselect the media type (default)
-.It media 10base5
-Use the AUI connector
-.It media 10base2
-Use the BNC connector
+The only supported configurations are:
+.Bl -column "xxxxxxxx" "xxxxxxxx" "0xffffffff"
+.It Li SW1 Ta SW2 Ta Address Ta Configuration
+.It " "
+.It Li "UUU_UU_U" Ta "U__U____" Ta "0xffff1200" Ta "1st board"
+.It Li "UUU_U_UU" Ta "U__U_U__" Ta "0xffff1400" Ta "2nd board"
+.It Li "UUU_U__U" Ta "U__UU___" Ta "0xffff1600" Ta "3rd board"
+.It Li "U_U_U_UU" Ta "U__UUU__" Ta "0xffff5400" Ta "4th board"
+.It Li "U_U_U__U" Ta "U_U_____" Ta "0xffff5600" Ta "5th board"
+.It Li "_U_UU_UU" Ta "U_U__U__" Ta "0xffffa400" Ta "6th board"
 .El
 .Sh SEE ALSO
 .Xr arp 4 ,
-.Xr ifmedia 4 ,
 .Xr inet 4 ,
 .Xr intro 4 ,
 .Xr netintro 4 ,
 .Xr vme 4 ,
 .Xr hostname.if 5 ,
 .Xr ifconfig 8
+.Sh BUGS
+The
+.Nm
+driver currently does not support the last three board address settings.
diff --git a/share/man/man4/man4.mvme88k/vs.4 b/share/man/man4/man4.mvme88k/vs.4
index 0a8afc741ff..9e122eb3146 100644
--- a/share/man/man4/man4.mvme88k/vs.4
+++ b/share/man/man4/man4.mvme88k/vs.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vs.4,v 1.2 2003/08/08 09:29:24 miod Exp $
+.\"	$OpenBSD: vs.4,v 1.3 2003/12/26 21:03:34 miod Exp $
 .\"
 .\" Copyright (c) 2003 Paul Weissmann
 .\" All rights reserved.
@@ -25,12 +25,12 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd May 14, 2003
+.Dd December 26, 2003
 .Dt VS 4 mvme88k
 .Os
 .Sh NAME
 .Nm vs
-.Nd MVME328 SCSI I/O adapter
+.Nd MVME328S High Performance SCSI Controller
 .Sh SYNOPSIS
 .Cd "vs0 at vmes0 addr 0xffff9000 ipl 2 len 0x800"
 .Cd "vs1 at vmes0 addr 0xffff9800 ipl 2 len 0x800"
@@ -42,12 +42,11 @@
 .Sh DESCRIPTION
 The
 .Nm
-provides access to the
-.Tn MVME328
+provides access to the MVME328S family of
 .Tn SCSI
 .Tn VME
-I/O board.
-Depending on the version it provides a single or dual channel
+I/O boards.
+Depending on the version, it provides a single or dual channel single-ended
 .Tn SCSI
 interface.
 It is attached to the
@@ -57,8 +56,36 @@ bus of the system, controlled by the
 .Tn VMEchip2
 interface chip.
 Several types of both internal and external connectors are provided, also
-depending on the version of the
-.Tn MVME328 .
+depending on the version of the MVME328S.
+.Sh HARDWARE CONFIGURATION
+The card's base address
+.Po
+matching the
+.Em addr
+locator on the configuration line
+.Pc
+is defined through a set of nine jumpers, labeled
+.Dq JB1
+on the board, near the fuse in a corner of the card.
+They are contiguous to the
+.Dq JA7
+single jumper and
+.Dq JA8
+dual jumper, located immediately to the left of the
+.Dq JB1
+block.
+.Pp
+The only supported configurations are:
+.Bl -column "xxxxxxxxx" "0xffffffff"
+.It Li JB1 Ta Address Ta Configuration
+.It " "
+.It Li "___X_XX__" Ta "0xffff9000" Ta "1st board"
+.It Li "_____XX__" Ta "0xffff9800" Ta "2nd board"
+.It Li "____XX_X_" Ta "0xffff4800" Ta "3rd board"
+.It Li "_____X_X_" Ta "0xffff5800" Ta "4th board"
+.It Li "___X___X_" Ta "0xffff7000" Ta "5th board"
+.It Li "_______X_" Ta "0xffff7800" Ta "6th board"
+.El
 .Sh SEE ALSO
 .Xr cd 4 ,
 .Xr ch 4 ,
@@ -69,3 +96,8 @@ depending on the version of the
 .Xr st 4 ,
 .Xr uk 4 ,
 .Xr vme 4
+.Sh BUGS
+The daughterboard providing access to the second
+.Tn SCSI
+channel is currently not supported by
+.Ox .