Support for MVME197 completed. Fix SPL defs.

5 files changed, 41 insertions, 32 deletions

diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC
index ecac7fa8358..dd41ea96f56 100644
--- a/sys/arch/mvme88k/conf/GENERIC
+++ b/sys/arch/mvme88k/conf/GENERIC
@@ -1,12 +1,14 @@
-#	$OpenBSD: GENERIC,v 1.22 2001/11/27 05:26:34 miod Exp $
+#	$OpenBSD: GENERIC,v 1.23 2001/12/13 08:55:51 smurph Exp $
 
 machine		mvme88k 
 
 include "../../../conf/GENERIC"
 
-option		MVME187		# support for 187
-option		MVME188		# support for 188
-#option		MVME197		# support for 197
+option		M88100		# support for mc88100 1st generation RISC
+option		M88110		# support for mc88120 2ond generation RISC
+option		MVME187		# support for 187 (requires M88100)
+option		MVME188		# support for 188 (requires M88100)
+#option		MVME197		# support for 197 (requires M88110)
 option		"NCPUS=1"	# number of CPUs supported (max 4)
 option		BUGMAP		# use the Bug ROM VME mappings
 #option		DEBUG		# print debugging statements
diff --git a/sys/arch/mvme88k/conf/M187 b/sys/arch/mvme88k/conf/M187
index de5ba16fd14..42f0534c32a 100644
--- a/sys/arch/mvme88k/conf/M187
+++ b/sys/arch/mvme88k/conf/M187
@@ -1,10 +1,11 @@
-#	$OpenBSD: M187,v 1.14 2001/11/27 05:26:34 miod Exp $
+#	$OpenBSD: M187,v 1.15 2001/12/13 08:55:51 smurph Exp $
 
 machine mvme88k
 
 include "../../../conf/GENERIC"
 
-option		MVME187		# support for 187
+option		M88100		# support for mc88100 1st generation RISC
+option		MVME187		# support for 187 (requires M88100)
 option		"NCPUS=1"	# Number of cpus supported (max 4)
 option		BUGMAP		# use Bug Rom VME Mappings
 #option		DEBUG		# print debugging statements
diff --git a/sys/arch/mvme88k/conf/M188 b/sys/arch/mvme88k/conf/M188
index bce658c7a96..0da9a562584 100644
--- a/sys/arch/mvme88k/conf/M188
+++ b/sys/arch/mvme88k/conf/M188
@@ -1,10 +1,13 @@
-#	$OpenBSD: M188,v 1.11 2001/11/27 05:26:34 miod Exp $
+#	$OpenBSD: M188,v 1.12 2001/12/13 08:55:51 smurph Exp $
 
 machine mvme88k
 
 include "../../../conf/GENERIC"
 
-option		MVME188		# support for 187
+# processors this kernel should support
+
+option		M88100		# support for mc88100 1st generation RISC
+option		MVME188		# support for 188 (requires M88100)
 option		"NCPUS=1"	# Number of cpus supported (max 4)
 option		BUGMAP		# use Bug Rom VME Mappings
 #option		DEBUG		# print debugging statements
diff --git a/sys/arch/mvme88k/conf/M197 b/sys/arch/mvme88k/conf/M197
index a65288c79a1..68804b99a1d 100644
--- a/sys/arch/mvme88k/conf/M197
+++ b/sys/arch/mvme88k/conf/M197
@@ -1,10 +1,13 @@
-#	$OpenBSD: M197,v 1.9 2001/11/27 05:26:34 miod Exp $
+#	$OpenBSD: M197,v 1.10 2001/12/13 08:55:51 smurph Exp $
 
 machine mvme88k
 
 include "../../../conf/GENERIC"
 
-option 		MVME197		# support for 197
+# processors this kernel should support
+
+option		M88110		# support for mc88120 2ond generation RISC
+option		MVME197		# support for 197 (requires M88110)
 option		"NCPUS=1"	# Number of cpus supported (max 4)
 option		BUGMAP		# use Bug Rom VME Mappings
 #option		DEBUG		# print debugging statements
@@ -22,10 +25,10 @@ mainbus0 at root
 
 # ------------------------------ mainbus devices ------------------------
 bugtty0 at mainbus0
-busswitch0 at mainbus0 addr 0xfff00000
+bussw0 at mainbus0 addr 0xfff00000
 
 # ----------------------------- busswitch devices -----------------------
-pcctwo0 at busswitch0 offset 0x42000
+pcctwo0 at bussw0 offset 0x42000
 
 # ------------------------------ pcctwo devices -------------------------
 clock0	at pcctwo0 ipl 5
@@ -44,19 +47,19 @@ 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
-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 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
-vs3	at vmes0 addr 0xffff5800 ipl 2 vec 0x86 len 0x800
-vs4	at vmes0 addr 0xffff7000 ipl 2 vec 0x88 len 0x800
-vs5	at vmes0 addr 0xffff7800 ipl 2 vec 0x8a len 0x800
+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
+vs0	at vmes0 addr 0xffff9000 ipl 2 len 0x800
+vs1	at vmes0 addr 0xffff9800 ipl 2 len 0x800
+vs2	at vmes0 addr 0xffff4800 ipl 2 len 0x800
+vs3	at vmes0 addr 0xffff5800 ipl 2 len 0x800
+vs4	at vmes0 addr 0xffff7000 ipl 2 len 0x800
+vs5	at vmes0 addr 0xffff7800 ipl 2 len 0x800
 
 # ------------------------------- vs0 devices --------------------------
 scsibus* at vs?
diff --git a/sys/arch/mvme88k/conf/files.mvme88k b/sys/arch/mvme88k/conf/files.mvme88k
index c0f8958e1dd..9de76315669 100644
--- a/sys/arch/mvme88k/conf/files.mvme88k
+++ b/sys/arch/mvme88k/conf/files.mvme88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.mvme88k,v 1.15 2001/11/23 00:39:41 miod Exp $
+#	$OpenBSD: files.mvme88k,v 1.16 2001/12/13 08:55:51 smurph Exp $
 #	
 maxpartitions 16
 
@@ -14,12 +14,12 @@ file	arch/mvme88k/dev/bugtty.c			bugtty needs-count
 device cpu
 attach cpu at mainbus
 
-device busswitch { [offset = -1], [ ipl = 0 ] }
-attach busswitch at mainbus
-file	arch/mvme88k/dev/busswitch.c			busswitch needs-count
+device bussw { [offset = -1], [ ipl = 0 ] }
+attach bussw at mainbus
+file	arch/mvme88k/dev/bussw.c			bussw needs-count
 
 device pcctwo { [offset = -1], [ ipl = 0 ] }
-attach pcctwo at busswitch, mainbus
+attach pcctwo at bussw, mainbus
 file	arch/mvme88k/dev/pcctwo.c			pcctwo needs-count
 
 device syscon { [offset = -1], [ ipl = 0 ] }
@@ -88,8 +88,8 @@ file	netns/ns_cksum.c				ns
 file	arch/mvme88k/mvme88k/autoconf.c
 file	arch/mvme88k/mvme88k/conf.c
 file	arch/mvme88k/mvme88k/cmmu.c
-file	arch/mvme88k/mvme88k/m18x_cmmu.c		mvme187 | mvme188
-file	arch/mvme88k/mvme88k/m197_cmmu.c		mvme197
+file	arch/mvme88k/mvme88k/m8820x.c			mvme187 | mvme188
+file	arch/mvme88k/mvme88k/m88110.c			mvme197
 file	arch/mvme88k/mvme88k/disksubr.c
 file	arch/mvme88k/mvme88k/dkbad.c
 file	arch/mvme88k/mvme88k/eh.S