Updates for the ssh->osiop change on mvme88k.

5 files changed, 13 insertions, 81 deletions

diff --git a/share/man/man4/man4.mvme88k/Makefile b/share/man/man4/man4.mvme88k/Makefile
index 8f0425de2c3..d2ead1be1bb 100644
--- a/share/man/man4/man4.mvme88k/Makefile
+++ b/share/man/man4/man4.mvme88k/Makefile
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.4 2004/02/09 19:21:51 espie Exp $
+#	$OpenBSD: Makefile,v 1.5 2004/05/07 18:14:57 miod Exp $
 
 # TODO: cl clock dart memc nvram sclock syscon vx
-MAN=	autoconf.4 bussw.4 ie.4 intro.4 le.4 mem.4 pcctwo.4 ssh.4 vme.4 vs.4
+MAN=	autoconf.4 bussw.4 ie.4 intro.4 le.4 mem.4 pcctwo.4 vme.4 vs.4
 MANSUBDIR=mvme88k
 
 MLINKS+= mem.4 kmem.4
diff --git a/share/man/man4/man4.mvme88k/intro.4 b/share/man/man4/man4.mvme88k/intro.4
index 0fcf1a946d7..c13be566722 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.3 2003/12/27 23:59:47 miod Exp $
+.\"	$OpenBSD: intro.4,v 1.4 2004/05/07 18:14:57 miod Exp $
 .\" Copyright (c) 1990, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -109,8 +109,8 @@ MVME376 Ethernet Communications Controller.
 .\" memory controller.
 .It Xr pcctwo 4
 PCCchip2 local bus controller.
-.It Xr ssh 4
-NCR 53C710 low level SCSI adapter interface.
+.It Xr osiop 4
+Symbios/NCR 53C710 SCSI controller.
 .\" .It Xr syscon 4
 .\" MVME188 system controller.
 .It Xr vme 4
diff --git a/share/man/man4/man4.mvme88k/pcctwo.4 b/share/man/man4/man4.mvme88k/pcctwo.4
index e590e4daea1..1541d6c3b55 100644
--- a/share/man/man4/man4.mvme88k/pcctwo.4
+++ b/share/man/man4/man4.mvme88k/pcctwo.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pcctwo.4,v 1.4 2004/05/05 13:17:46 miod Exp $
+.\"	$OpenBSD: pcctwo.4,v 1.5 2004/05/07 18:14:57 miod Exp $
 .\"
 .\" Copyright (c) 2003 Paul Weissmann
 .\" All rights reserved.
@@ -68,9 +68,8 @@ Host interface to
 i82596CA LAN coprocessor
 .It
 Host interface to
-.Xr ssh 4
-.Tn NCR
-53C710 SCSI I/O processor
+.Xr osiop 4
+Symbios/NCR 53C710 SCSI controller
 .It
 Interface to the
 .Xr memc 4
@@ -82,4 +81,4 @@ Memory controller ASIC
 .Xr ie 4 ,
 .Xr intro 4 ,
 .\" .Xr memc 4 ,
-.Xr ssh 4
+.Xr osiop 4
diff --git a/share/man/man4/man4.mvme88k/ssh.4 b/share/man/man4/man4.mvme88k/ssh.4
deleted file mode 100644
index 5b438ef1cf7..00000000000
--- a/share/man/man4/man4.mvme88k/ssh.4
+++ /dev/null
@@ -1,63 +0,0 @@
-.\"	$OpenBSD: ssh.4,v 1.2 2003/08/08 09:29:24 miod Exp $
-.\"
-.\" Copyright (c) 2003 Paul Weissmann
-.\" All rights reserved.
-.\"
-.\"
-.\" 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 REGENTS 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 REGENTS 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 May 14, 2003
-.Dt SSH 4 mvme88k
-.Os
-.Sh NAME
-.Nm ssh
-.Nd NCR 53C710 SCSI I/O processor
-.Sh SYNOPSIS
-.Cd "ssh0 at pcctwo0 offset 0x47000 ipl 2"
-.Cd "scsibus* at ssh?"
-.Sh DESCRIPTION
-The
-.Nm
-driver provides access to the
-.Tn NCR
-53C710 SCSI I/O processor chip,
-which is found on-board on both the
-.Tn MVME187
-and the
-.Tn MVME197
-boards.
-The attachment to the local bus is always implemented via the
-.Xr pcctwo 4
-.Tn PCCchip2
-interface.
-.Sh SEE ALSO
-.Xr cd 4 ,
-.Xr ch 4 ,
-.Xr intro 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/techlib/techdocs/storage_stand_prod/
diff --git a/share/man/man4/osiop.4 b/share/man/man4/osiop.4
index e5f6c3d60a4..59caab3a202 100644
--- a/share/man/man4/osiop.4
+++ b/share/man/man4/osiop.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: osiop.4,v 1.5 2004/03/21 19:50:25 miod Exp $
+.\"	$OpenBSD: osiop.4,v 1.6 2004/05/07 18:14:55 miod Exp $
 .\"	$NetBSD: osiop.4,v 1.2 2001/09/22 01:44:55 wiz Exp $
 .\"
 .\" Copyright (c) 2001 Izumi Tsutsui.  All rights reserved.
@@ -32,9 +32,8 @@
 .Nm osiop
 .Nd Symbios/NCR 53C710 SCSI driver
 .Sh SYNOPSIS
-.Cd "# hppa"
-.Cd "osiop* at gsc? irq 9"
-.Pp
+.Cd "osiop* at gsc? irq 9                  " Pq "hppa"
+.Cd "osiop0 at pcctwo0 offset 0x47000 ipl 2" Pq "mvme88k"
 .Cd "scsibus* at osiop?"
 .Sh DESCRIPTION
 The
@@ -90,10 +89,6 @@ Note that
 .Tn SCSI
 tape drives should be allowed to perform disconnect/reselect or performance
 will suffer.
-.\" .Sh BUGS
-.\" Neither
-.\" .Tn DMA
-.\" or synchronous data transfers are currently supported.
 .Sh SEE ALSO
 .Xr cd 4 ,
 .Xr ch 4 ,
@@ -108,6 +103,7 @@ will suffer.
 .Pp
 .Pa http://www.lsilogic.com/techlib/techdocs/storage_stand_prod/
 .Sh HISTORY
+The
 .Nm
 driver first appeared in
 .Nx 1.6 .