Replace the old ssh(4) NCR53C710 scsi driver with a pcctwo attachment for

the MI osiop(4) driver.

This improves performance very slighly and should also improve reliability.

Tested on 25MHz (50MHz osiop) and 33MHz (66MHz osiop) MVME187 boards.

5 files changed, 17 insertions, 18 deletions

diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC
index 0ec3af450cf..f9a1a124656 100644
--- a/sys/arch/mvme88k/conf/GENERIC
+++ b/sys/arch/mvme88k/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.42 2004/04/29 14:33:27 miod Exp $
+#	$OpenBSD: GENERIC,v 1.43 2004/05/07 18:12:55 miod Exp $
 
 machine		mvme88k m88k
 
@@ -38,7 +38,7 @@ clock0	at pcctwo0 ipl 5
 nvram0	at pcctwo0 offset 0xc0000
 vme0	at pcctwo0 offset 0x40000
 ie0	at pcctwo0 offset 0x46000 ipl 1
-ssh0	at pcctwo0 offset 0x47000 ipl 2
+osiop0	at pcctwo0 offset 0x47000 ipl 2
 cl0	at pcctwo0 offset 0x45000 ipl 3
 cl1	at pcctwo0 offset 0x45200 ipl 3		# M8120 only
 #lptwo0	at pcctwo0 offset 0x45000 ipl 1
@@ -70,7 +70,7 @@ vs4	at vmes0 addr 0xffff7000 ipl 2
 vs5	at vmes0 addr 0xffff7800 ipl 2
 
 scsibus* at vs?
-scsibus* at ssh?
+scsibus* at osiop?
 
 sd*	at scsibus? target ? lun ?
 st*	at scsibus? target ? lun ?
diff --git a/sys/arch/mvme88k/conf/M187 b/sys/arch/mvme88k/conf/M187
index 037f444695a..f525dacd1ac 100644
--- a/sys/arch/mvme88k/conf/M187
+++ b/sys/arch/mvme88k/conf/M187
@@ -1,4 +1,4 @@
-#	$OpenBSD: M187,v 1.30 2004/04/29 14:33:27 miod Exp $
+#	$OpenBSD: M187,v 1.31 2004/05/07 18:12:55 miod Exp $
 
 machine mvme88k m88k
 
@@ -29,7 +29,7 @@ clock0	at pcctwo0 ipl 5
 vme0	at pcctwo0 offset 0x40000
 nvram0	at pcctwo0 offset 0xc0000
 ie0	at pcctwo0 offset 0x46000 ipl 1
-ssh0	at pcctwo0 offset 0x47000 ipl 2
+osiop0	at pcctwo0 offset 0x47000 ipl 2
 cl0	at pcctwo0 offset 0x45000 ipl 3
 cl1	at pcctwo0 offset 0x45200 ipl 3		# M8120 only
 #lptwo0	at pcctwo0 offset 0x45000 ipl 1 size
@@ -58,8 +58,8 @@ vs5	at vmes0 addr 0xffff7800 ipl 2
 # ------------------------------- vs0 devices --------------------------
 scsibus* at vs?
 
-# ------------------------------ ssh0 devices --------------------------
-scsibus* at ssh?
+# ----------------------------- osiop0 devices -------------------------
+scsibus* at osiop?
 
 # ------------------------------ scsibus0 devices ----------------------
 sd*	at scsibus? target ? lun ?
diff --git a/sys/arch/mvme88k/conf/M197 b/sys/arch/mvme88k/conf/M197
index ae4f9f8ee71..ad1085380ca 100644
--- a/sys/arch/mvme88k/conf/M197
+++ b/sys/arch/mvme88k/conf/M197
@@ -1,4 +1,4 @@
-#	$OpenBSD: M197,v 1.24 2004/04/29 14:33:27 miod Exp $
+#	$OpenBSD: M197,v 1.25 2004/05/07 18:12:55 miod Exp $
 
 machine mvme88k m88k
 
@@ -30,7 +30,7 @@ clock0	at pcctwo0 ipl 5
 vme0	at pcctwo0 offset 0x40000
 nvram0	at pcctwo0 offset 0xc0000
 ie0	at pcctwo0 offset 0x46000 ipl 1
-ssh0	at pcctwo0 offset 0x47000 ipl 2
+osiop0	at pcctwo0 offset 0x47000 ipl 2
 cl0	at pcctwo0 offset 0x45000 ipl 3
 #lptwo0	at pcctwo0 addr 0x45000 ipl 1 size
 #memc0	at pcctwo0 addr 0x43000
@@ -58,8 +58,8 @@ vs5	at vmes0 addr 0xffff7800 ipl 2
 # ------------------------------- vs0 devices --------------------------
 scsibus* at vs?
 
-# ------------------------------ ssh0 devices --------------------------
-scsibus* at ssh?
+# ----------------------------- osiop0 devices -------------------------
+scsibus* at osiop?
 
 # ------------------------------ scsibus? devices ----------------------
 sd*	at scsibus? target ? lun ?
diff --git a/sys/arch/mvme88k/conf/RAMDISK b/sys/arch/mvme88k/conf/RAMDISK
index 7fa300ed1dd..082de531dcd 100644
--- a/sys/arch/mvme88k/conf/RAMDISK
+++ b/sys/arch/mvme88k/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.23 2004/04/29 14:33:27 miod Exp $
+#	$OpenBSD: RAMDISK,v 1.24 2004/05/07 18:12:55 miod Exp $
 
 machine		mvme88k m88k
 
@@ -49,7 +49,7 @@ clock0	at pcctwo0 ipl 5
 vme0	at pcctwo0 offset 0x40000
 nvram0	at pcctwo0 offset 0xc0000
 ie0	at pcctwo0 offset 0x46000 ipl 1
-ssh0	at pcctwo0 offset 0x47000 ipl 2
+osiop0	at pcctwo0 offset 0x47000 ipl 2
 cl0	at pcctwo0 offset 0x45000 ipl 3
 #cl1	at pcctwo0 offset 0x45200 ipl 3		# M8120 only
 
@@ -76,7 +76,7 @@ vs4	at vmes0 addr 0xffff7000 ipl 2
 vs5	at vmes0 addr 0xffff7800 ipl 2
 
 scsibus* at vs?
-scsibus* at ssh?
+scsibus* at osiop?
 
 sd*	at scsibus? target ? lun ?
 st*	at scsibus? target ? lun ?
diff --git a/sys/arch/mvme88k/conf/files.mvme88k b/sys/arch/mvme88k/conf/files.mvme88k
index 87343c135e9..5f9fcce0556 100644
--- a/sys/arch/mvme88k/conf/files.mvme88k
+++ b/sys/arch/mvme88k/conf/files.mvme88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.mvme88k,v 1.28 2004/05/07 18:10:26 miod Exp $
+#	$OpenBSD: files.mvme88k,v 1.29 2004/05/07 18:12:55 miod Exp $
 #
 maxpartitions 16
 
@@ -54,9 +54,8 @@ major { cd = 6 }
 major { rd = 7 }
 major { vnd = 8 }
 
-device ssh: scsi
-attach ssh at pcctwo
-file	arch/mvme88k/dev/ssh.c				ssh
+attach osiop at pcctwo with osiop_pcctwo
+file	arch/mvme88k/dev/osiop_pcctwo.c			osiop_pcctwo
 
 device vme { }
 attach vme at pcctwo, syscon