oops!

3 files changed, 19 insertions, 13 deletions

diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC
index 70c9de51ee5..4c65ca448e0 100644
--- a/sys/arch/mvme88k/conf/GENERIC
+++ b/sys/arch/mvme88k/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.9 1999/09/27 21:21:15 smurph Exp $
+#	$OpenBSD: GENERIC,v 1.10 1999/09/27 21:30:11 smurph Exp $
 
 machine		mvme88k 
 
@@ -33,7 +33,7 @@ clock0	at pcctwo0 ipl 5
 sclock0	at pcctwo0 ipl 5
 nvram0	at pcctwo0 offset 0xc0000
 vme0	at pcctwo0 offset 0x40000
-ie0	at pcctwo0 offset 0x46000 ipl 3
+ie0	at pcctwo0 offset 0x46000 ipl 1
 siop0	at pcctwo0 offset 0x47000 ipl 2
 cl0	at pcctwo0 offset 0x45000 ipl 3
 #lptwo0	at pcctwo0 addr 0xfff45000 ipl 1 size
@@ -56,9 +56,9 @@ vx0	at vmes0 addr 0xff780000 ipl 3 vec 0x70 len 0x10000
 vx1	at vmes0 addr 0xff790000 ipl 3 vec 0x71	len 0x10000
 vx2	at vmes0 addr 0xff7a0000 ipl 3 vec 0x72 len 0x10000
 vx3	at vmes0 addr 0xff7b0000 ipl 3 vec 0x73 len 0x10000
-ve0	at vmes0 addr 0xffff1200 ipl 3 vec 0x74 len 0x100
-ve1	at vmes0 addr 0xffff1400 ipl 3 vec 0x75 len 0x100
-ve2	at vmes0 addr 0xffff1600 ipl 3 vec 0x76 len 0x100
+ve0	at vmes0 addr 0xffff1200 ipl 1 vec 0x74 len 0x100
+ve1	at vmes0 addr 0xffff1400 ipl 1 vec 0x75 len 0x100
+ve2	at vmes0 addr 0xffff1600 ipl 1 vec 0x76 len 0x100
 vs0	at vmes0 addr 0xffff9000 ipl 2 vec 0x80 len 0x800
 vs1	at vmes0 addr 0xffff9800 ipl 2 vec 0x82 len 0x800
 vs2	at vmes0 addr 0xffff4800 ipl 2 vec 0x84 len 0x800
diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k
index e275ae19e27..a00328aba3d 100644
--- a/sys/arch/mvme88k/conf/Makefile.mvme88k
+++ b/sys/arch/mvme88k/conf/Makefile.mvme88k
@@ -1,5 +1,5 @@
 #	@(#)Makefile.hp300	7.10 (Berkeley) 6/27/91
-#	$Id: Makefile.mvme88k,v 1.6 1999/09/27 21:21:15 smurph Exp $
+#	$Id: Makefile.mvme88k,v 1.7 1999/09/27 21:30:11 smurph Exp $
 #
 # Makefile for OpenBSD
 #
@@ -100,7 +100,6 @@ SYSTEM_LD=	-@if [ X${DEBUG} = X-g ]; \
 		then strip=-X; \
 		else strip=-x; \
 		fi; \
-		
 		echo ${LD} $$strip -Ttext 0x10000 -o $@ '$${SYSTEM_OBJ}' vers.o; \
 		${LD} $$strip -Ttext 0x10000 -e start ${LINKFLAGS} -o $@ \
 			${SYSTEM_OBJ} vers.o -lgcc -lgcc
diff --git a/sys/arch/mvme88k/conf/XT b/sys/arch/mvme88k/conf/XT
index 352ace495d8..e471a4119a0 100644
--- a/sys/arch/mvme88k/conf/XT
+++ b/sys/arch/mvme88k/conf/XT
@@ -1,4 +1,4 @@
-#	$OpenBSD: XT,v 1.2 1999/09/27 21:21:16 smurph Exp $
+#	$OpenBSD: XT,v 1.3 1999/09/27 21:30:11 smurph Exp $
 
 machine mvme88k
 
@@ -75,35 +75,39 @@ option		DDB		# Kernel debugger
 
 # ------------------------------ devices --------------------------------
 mainbus0 at root
+
 # ------------------------------ mainbus devices ------------------------
 bugtty0 at mainbus0
-#sram0	at mainbus0 addr 0xffe00000
-#vme0	at mainbus0 addr 0xfff40000
+busswitch0 at mainbus0 addr 0xfff00000
 pcctwo0 at mainbus0 addr 0xfff00000
 syscon0 at mainbus0 addr 0xfff00000
-busswitch0 at mainbus0 addr 0xfff00000
+
 # ----------------------------- busswicth devices -----------------------
 pcctwo0 at busswitch0 offset 0x42000
+
 # ------------------------------ pcctwo devices -------------------------
 clock0	at pcctwo0 ipl 5
 sclock0	at pcctwo0 ipl 5
 vme0	at pcctwo0 offset 0x40000
 nvram0	at pcctwo0 offset 0xc0000
-ie0	at pcctwo0 offset 0x46000 ipl 3
+ie0	at pcctwo0 offset 0x46000 ipl 1
 siop0	at pcctwo0 offset 0x47000 ipl 2
 cl0	at pcctwo0 offset 0x45000 ipl 3
 #lptwo0	at pcctwo0 addr 0xfff45000 ipl 1 size
 #memc0	at pcctwo0 addr 0xfff43000
 #memc1	at pcctwo0 addr 0xfff43100
+
 # ------------------------------ syscon0 devices ------------------------
 clock0	at syscon0 ipl 5
 sclock0	at syscon0 ipl 5
 nvram0	at syscon0 offset 0x80000
 dart0	at syscon0 offset 0x82000 ipl 3
 vme0	at syscon0 offset 0x85000
+
 # ------------------------------ vme0 devices --------------------------
 vmes0	at vme0
 vmel0	at vme0
+
 # ------------------------------ vmes0 devices -------------------------
 vx0	at vmes0 addr 0xff780000 ipl 3 vec 0x70 len 0x10000
 vx1	at vmes0 addr 0xff790000 ipl 3 vec 0x71	len 0x10000
@@ -121,12 +125,15 @@ vs5	at vmes0 addr 0xffff7800 ipl 2 vec 0x8a len 0x800
 
 # ------------------------------ svme0 devices -------------------------
 scsibus* at vs?
+
 # ------------------------------ siop0 devices -------------------------
 scsibus* at siop?
-# ------------------------------ scsibus0 devices ----------------------
+
+# ------------------------------ scsibus? devices ----------------------
 sd*	at scsibus? target ? lun ?
 st*	at scsibus? target ? lun ?
 cd*	at scsibus? target ? lun ?
+
 # ------------------------------ pseudo devices ------------------------
 pseudo-device	vnd	4	# paging to files
 pseudo-device	bpfilter 8	# packet filter