Sync with reality.

4 files changed, 83 insertions, 70 deletions

diff --git a/share/man/man4/man4.mvme68k/Makefile b/share/man/man4/man4.mvme68k/Makefile
index 98dc70ee703..4cfdc4e32cc 100644
--- a/share/man/man4/man4.mvme68k/Makefile
+++ b/share/man/man4/man4.mvme68k/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.7 2003/09/02 21:32:13 miod Exp $
+#	$OpenBSD: Makefile,v 1.8 2009/02/17 22:32:36 miod Exp $
 #	from: @(#)Makefile	8.2 (Berkeley) 2/16/94
 
-# TODO: cl clock flash ipic lp mc memc nvram pcc pcctwo sram vme vs wdsc zs
-MAN=	autoconf.4 intro.4 le.4 ie.4 mem.4 ssh.4
+# TODO: cl clock flash ipic lp mc memc nvram pcc pcctwo sram vme wdsc zs
+MAN=	autoconf.4 intro.4 le.4 ie.4 mem.4 vs.4 vsbic.4
 MLINKS=	mem.4 kmem.4
 MANSUBDIR=mvme68k
 
diff --git a/share/man/man4/man4.mvme68k/intro.4 b/share/man/man4/man4.mvme68k/intro.4
index 8a5b7ef8c89..c6c9b5ddf7d 100644
--- a/share/man/man4/man4.mvme68k/intro.4
+++ b/share/man/man4/man4.mvme68k/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.24 2007/06/21 19:56:54 jmc Exp $
+.\"	$OpenBSD: intro.4,v 1.25 2009/02/17 22:32:36 miod Exp $
 .\" Copyright (c) 1990, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -28,7 +28,7 @@
 .\"
 .\"     from: @(#)intro.4	5.2 (Berkeley) 3/27/91
 .\"
-.Dd $Mdocdate: June 21 2007 $
+.Dd $Mdocdate: February 17 2009 $
 .Dt INTRO 4 mvme68k
 .Os
 .Sh NAME
@@ -113,18 +113,20 @@ MVME147 printer interface
 MVME162 MCchip
 .It Xr memc
 MVME1[67]x memory controller
+.It Xr osiop 4
+Symbios/NCR 53C710 SCSI driver
 .It Xr pcc
 MVME147 PCC chip
 .It Xr pcctwo
 MVME1[67]7 PCC2 chip
 .It Xr sram
 MVME162 static memory
-.It Xr ssh 4
-NCR 53c7xx SCSI driver
 .It Xr vme
 VME bus support
-.It Xr vs
-MVME328 low level SCSI adapter interface
+.It Xr vs 4
+MVME328, MVME328S and MVME328XT high performance SCSI controller
+.It Xr vsbic 4
+MVME327A SCSI and floppy controller
 .It Xr wdsc
 WD33C93 SCSI adapter interface
 .It Xr zs
diff --git a/share/man/man4/man4.mvme68k/ssh.4 b/share/man/man4/man4.mvme68k/ssh.4
deleted file mode 100644
index b1b41f9a4b4..00000000000
--- a/share/man/man4/man4.mvme68k/ssh.4
+++ /dev/null
@@ -1,61 +0,0 @@
-.\"	$OpenBSD: ssh.4,v 1.4 2007/05/31 19:19:55 jmc Exp $
-.\"	$NetBSD: siop.4,v 1.3 2000/10/23 16:38:10 bouyer Exp $
-.\"
-.\" Copyright (c) 2000 Manuel Bouyer.
-.\"
-.\" 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.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 $Mdocdate: May 31 2007 $
-.Dt SSH 4 mvme68k
-.Os
-.Sh NAME
-.Nm ssh
-.Nd NCR 53c7xx SCSI driver
-.Sh SYNOPSIS
-.Cd "ssh0 at mc0 offset 0x47000 ipl 2"
-.Cd "ssh0 at pcctwo0 offset 0x47000 ipl 2"
-.Cd "scsibus* at ssh?"
-.Sh DESCRIPTION
-The
-.Nm
-driver provides support for NCR 53c7xx and related
-.Tn SCSI
-controller chips.
-.Sh SEE ALSO
-.Xr cd 4 ,
-.Xr ch 4 ,
-.Xr intro 4 ,
-.\" .Xr mc 4 ,
-.\" .Xr pcctwo 4 ,
-.Xr scsi 4 ,
-.Xr sd 4 ,
-.Xr ss 4 ,
-.Xr st 4 ,
-.Xr uk 4
-.Pp
-.Pa http://www.lsilogic.com/
diff --git a/share/man/man4/man4.mvme68k/vsbic.4 b/share/man/man4/man4.mvme68k/vsbic.4
new file mode 100644
index 00000000000..5a3ab940851
--- /dev/null
+++ b/share/man/man4/man4.mvme68k/vsbic.4
@@ -0,0 +1,72 @@
+.\"	$OpenBSD: vsbic.4,v 1.1 2009/02/17 22:32:36 miod Exp $
+.\"
+.\" Copyright (c) 2009 Miodrag Vallat.
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd $Mdocdate: February 17 2009 $
+.Dt VSBIC 4 mvme88k
+.Os
+.Sh NAME
+.Nm vsbic
+.Nd MVME327A SCSI and floppy controller
+.Sh SYNOPSIS
+.Cd "vsbic* at vmes0 addr 0xffffa600 ipl 2 vec 0x8c"
+.Cd "vsbic* at vmes0 addr 0xffffa700 ipl 2 vec 0x8d"
+.Cd "scsibus* at vsbic?"
+.Sh DESCRIPTION
+The
+.Nm
+driver supports the SCSI interface of the Motorola MVME327A
+SCSI and floppy VME controller.
+The WD33C93 SCSI controller found on this board is not directly accessible;
+instead, the
+.Nm
+driver runs SCSI commands through the MVME327A firmware interface.
+.Sh HARDWARE CONFIGURATION
+The card's base address
+.Po
+matching the
+.Em addr
+locator on the configuration line
+.Pc
+is defined through a block of eight jumpers, labeled
+.Dq J5
+on the board, near its center.
+.Pp
+With the card oriented with its faceplate at the bottom and the VME connectors
+at the top, the supported configurations are:
+.Bl -column "xxxxxxxx" "0xffffffff" -offset indent
+.It Li J5 Ta Address Ta Configuration
+.It Li "_X_XX__X" Ta "0xffffa600" Ta "1st board"
+.It Li "_X_XX___" Ta "0xffffa700" Ta "2nd board"
+.El
+.Sh SEE ALSO
+.Xr cd 4 ,
+.Xr ch 4 ,
+.Xr intro 4 ,
+.Xr scsi 4 ,
+.Xr sd 4 ,
+.Xr ss 4 ,
+.Xr st 4 ,
+.Xr uk 4 ,
+.Xr vme 4
+.Sh BUGS
+Due to firmware limitations, SCSI commands using command blocks larger than
+12 bytes are not supported.
+Therefore, only the first 2TB of SCSI disks are accessible.
+.Pp
+The
+.Nm
+driver refuses to attach on systems with 68060 processors at the moment,
+due to cache memory management bugs.