Enable vx(4) again - while it still awaits more tests, it can attach without

affecting a multiuser boot.

5 files changed, 25 insertions, 25 deletions

diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC
index 46e401bf9eb..34ee1f517bc 100644
--- a/sys/arch/mvme88k/conf/GENERIC
+++ b/sys/arch/mvme88k/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.35 2003/12/25 00:21:16 miod Exp $
+#	$OpenBSD: GENERIC,v 1.36 2003/12/25 21:02:46 miod Exp $
 
 machine		mvme88k
 
@@ -50,10 +50,10 @@ vme0	at syscon0 offset 0x85000
 vmes0	at vme0
 vmel0	at vme0
 
-vx0	at vmes0 disable addr 0xff780000 ipl 3 len 0x10000
-vx1	at vmes0 disable addr 0xff790000 ipl 3 len 0x10000
-vx2	at vmes0 disable addr 0xff7a0000 ipl 3 len 0x10000
-vx3	at vmes0 disable addr 0xff7b0000 ipl 3 len 0x10000
+vx0	at vmes0 addr 0xff780000 ipl 3 len 0x10000
+vx1	at vmes0 addr 0xff790000 ipl 3 len 0x10000
+vx2	at vmes0 addr 0xff7a0000 ipl 3 len 0x10000
+vx3	at vmes0 addr 0xff7b0000 ipl 3 len 0x10000
 ve0	at vmes0 addr 0xffff1200 ipl 1 len 0x100
 ve1	at vmes0 addr 0xffff1400 ipl 1 len 0x100
 ve2	at vmes0 addr 0xffff1600 ipl 1 len 0x100
diff --git a/sys/arch/mvme88k/conf/M187 b/sys/arch/mvme88k/conf/M187
index d48a4d6d91c..63e2003dd24 100644
--- a/sys/arch/mvme88k/conf/M187
+++ b/sys/arch/mvme88k/conf/M187
@@ -1,4 +1,4 @@
-#	$OpenBSD: M187,v 1.23 2003/12/25 00:21:16 miod Exp $
+#	$OpenBSD: M187,v 1.24 2003/12/25 21:02:46 miod Exp $
 
 machine mvme88k
 
@@ -39,10 +39,10 @@ vmes0	at vme0
 vmel0	at vme0
 
 # ------------------------------ vmes0 devices -------------------------
-vx0	at vmes0 disable addr 0xff780000 ipl 3 len 0x10000
-vx1	at vmes0 disable addr 0xff790000 ipl 3 len 0x10000
-vx2	at vmes0 disable addr 0xff7a0000 ipl 3 len 0x10000
-vx3	at vmes0 disable addr 0xff7b0000 ipl 3 len 0x10000
+vx0	at vmes0 addr 0xff780000 ipl 3 len 0x10000
+vx1	at vmes0 addr 0xff790000 ipl 3 len 0x10000
+vx2	at vmes0 addr 0xff7a0000 ipl 3 len 0x10000
+vx3	at vmes0 addr 0xff7b0000 ipl 3 len 0x10000
 ve0	at vmes0 addr 0xffff1200 ipl 1 len 0x100
 ve1	at vmes0 addr 0xffff1400 ipl 1 len 0x100
 ve2	at vmes0 addr 0xffff1600 ipl 1 len 0x100
diff --git a/sys/arch/mvme88k/conf/M188 b/sys/arch/mvme88k/conf/M188
index c1fab00aade..bcffce93216 100644
--- a/sys/arch/mvme88k/conf/M188
+++ b/sys/arch/mvme88k/conf/M188
@@ -1,4 +1,4 @@
-#	$OpenBSD: M188,v 1.18 2003/12/25 00:21:16 miod Exp $
+#	$OpenBSD: M188,v 1.19 2003/12/25 21:02:46 miod Exp $
 
 machine mvme88k
 
@@ -35,10 +35,10 @@ vmes0	at vme0
 vmel0	at vme0
 
 # ------------------------------ vmes0 devices -------------------------
-vx0	at vmes0 disable addr 0xff780000 ipl 3 len 0x10000
-vx1	at vmes0 disable addr 0xff790000 ipl 3 len 0x10000
-vx2	at vmes0 disable addr 0xff7a0000 ipl 3 len 0x10000
-vx3	at vmes0 disable addr 0xff7b0000 ipl 3 len 0x10000
+vx0	at vmes0 addr 0xff780000 ipl 3 len 0x10000
+vx1	at vmes0 addr 0xff790000 ipl 3 len 0x10000
+vx2	at vmes0 addr 0xff7a0000 ipl 3 len 0x10000
+vx3	at vmes0 addr 0xff7b0000 ipl 3 len 0x10000
 ve0	at vmes0 addr 0xffff1200 ipl 1 len 0x100
 ve1	at vmes0 addr 0xffff1400 ipl 1 len 0x100
 ve2	at vmes0 addr 0xffff1600 ipl 1 len 0x100
diff --git a/sys/arch/mvme88k/conf/M197 b/sys/arch/mvme88k/conf/M197
index 21916281b40..eff00c4cc00 100644
--- a/sys/arch/mvme88k/conf/M197
+++ b/sys/arch/mvme88k/conf/M197
@@ -1,4 +1,4 @@
-#	$OpenBSD: M197,v 1.19 2003/12/25 00:21:16 miod Exp $
+#	$OpenBSD: M197,v 1.20 2003/12/25 21:02:46 miod Exp $
 
 machine mvme88k
 
@@ -43,10 +43,10 @@ vmes0	at vme0
 vmel0	at vme0
 
 # ------------------------------ vmes0 devices -------------------------
-vx0	at vmes0 disable addr 0xff780000 ipl 3 len 0x10000
-vx1	at vmes0 disable addr 0xff790000 ipl 3 len 0x10000
-vx2	at vmes0 disable addr 0xff7a0000 ipl 3 len 0x10000
-vx3	at vmes0 disable addr 0xff7b0000 ipl 3 len 0x10000
+vx0	at vmes0 addr 0xff780000 ipl 3 len 0x10000
+vx1	at vmes0 addr 0xff790000 ipl 3 len 0x10000
+vx2	at vmes0 addr 0xff7a0000 ipl 3 len 0x10000
+vx3	at vmes0 addr 0xff7b0000 ipl 3 len 0x10000
 ve0	at vmes0 addr 0xffff1200 ipl 1 len 0x100
 ve1	at vmes0 addr 0xffff1400 ipl 1 len 0x100
 ve2	at vmes0 addr 0xffff1600 ipl 1 len 0x100
diff --git a/sys/arch/mvme88k/conf/RAMDISK b/sys/arch/mvme88k/conf/RAMDISK
index a0a7b56ab80..68d8a881579 100644
--- a/sys/arch/mvme88k/conf/RAMDISK
+++ b/sys/arch/mvme88k/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.15 2003/12/25 00:21:16 miod Exp $
+#	$OpenBSD: RAMDISK,v 1.16 2003/12/25 21:02:46 miod Exp $
 
 machine		mvme88k
 
@@ -56,10 +56,10 @@ vme0	at syscon0 offset 0x85000
 vmes0	at vme0
 vmel0	at vme0
 
-vx0	at vmes0 disable addr 0xff780000 ipl 3 len 0x10000
-vx1	at vmes0 disable addr 0xff790000 ipl 3 len 0x10000
-vx2	at vmes0 disable addr 0xff7a0000 ipl 3 len 0x10000
-vx3	at vmes0 disable addr 0xff7b0000 ipl 3 len 0x10000
+vx0	at vmes0 addr 0xff780000 ipl 3 len 0x10000
+vx1	at vmes0 addr 0xff790000 ipl 3 len 0x10000
+vx2	at vmes0 addr 0xff7a0000 ipl 3 len 0x10000
+vx3	at vmes0 addr 0xff7b0000 ipl 3 len 0x10000
 ve0	at vmes0 addr 0xffff1200 ipl 1 len 0x100
 ve1	at vmes0 addr 0xffff1400 ipl 1 len 0x100
 ve2	at vmes0 addr 0xffff1600 ipl 1 len 0x100