Omega is now VAX_BTYP_1301. Also add an STYP for 4000 600.

5 files changed, 25 insertions, 14 deletions

diff --git a/sys/arch/vax/include/sid.h b/sys/arch/vax/include/sid.h
index 8b075098c67..e34a8bc9067 100644
--- a/sys/arch/vax/include/sid.h
+++ b/sys/arch/vax/include/sid.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sid.h,v 1.8 2001/02/25 15:48:19 hugh Exp $	*/
+/*	$OpenBSD: sid.h,v 1.9 2001/03/12 11:45:35 hugh Exp $	*/
 /*	$NetBSD: sid.h,v 1.12 1999/12/11 17:55:13 ragge Exp $	*/
 
 /*
@@ -157,15 +157,19 @@
 #define VAX_TYP_NVAX	19
 #define VAX_TYP_V13	19
  
-#define VAX_BTYP_680	0x13000001	/* VAX 4000 model [45]00 */
+#define VAX_BTYP_1301	0x13000001	/* VAX 4000 model [4-6]00 */
 #define VAX_STYP_675	0x00000c	/* VAX 4000 model 400 */
 #define VAX_STYP_680	0x000006	/* VAX 4000 model 500 */
+#define VAX_STYP_690	0x000007	/* VAX 4000 model 600 */
+
 #define VAX_BTYP_1302	0x13000002
+
 #define VAX_BTYP_1303	0x13000003	/* Cheetah machines */
 #define VAX_STYP_50	0x000008	/* KA50 or KA55 */
 #define VAX_STYP_51	0x000009	/* MicroVAX 3100 model 90 / 95 */
 #define VAX_STYP_52	0x00000a	/* VAX 4000 model 100 */
 #define VAX_STYP_53	0x00000b	/* VAX 4000 model 105A */
+
 #define VAX_BTYP_49	0x13000004	/* VaxStation 4000 model 90 */
 
 /*
diff --git a/sys/arch/vax/vax/findcpu.c b/sys/arch/vax/vax/findcpu.c
index e9274042bee..d212f0d743e 100644
--- a/sys/arch/vax/vax/findcpu.c
+++ b/sys/arch/vax/vax/findcpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: findcpu.c,v 1.6 2001/02/24 10:31:58 hugh Exp $	*/
+/*	$OpenBSD: findcpu.c,v 1.7 2001/03/12 11:45:38 hugh Exp $	*/
 /*	$NetBSD: findcpu.c,v 1.5 1999/08/23 19:10:43 ragge Exp $	*/
 /*
  * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
@@ -107,7 +107,7 @@ findcpu()
 		case VAX_BTYP_650:
 		case VAX_BTYP_660:
 		case VAX_BTYP_670:
-		case VAX_BTYP_680:
+		case VAX_BTYP_1301:
 		case VAX_BTYP_1303:
 			vax_bustype = VAX_IBUS;
 			break;
diff --git a/sys/arch/vax/vax/gencons.c b/sys/arch/vax/vax/gencons.c
index 22b7286c2b3..fb03653385f 100644
--- a/sys/arch/vax/vax/gencons.c
+++ b/sys/arch/vax/vax/gencons.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gencons.c,v 1.9 2001/02/24 10:31:58 hugh Exp $	*/
+/*	$OpenBSD: gencons.c,v 1.10 2001/03/12 11:45:38 hugh Exp $	*/
 /*	$NetBSD: gencons.c,v 1.22 2000/01/24 02:40:33 matt Exp $	*/
 
 /*
@@ -274,7 +274,7 @@ gencnprobe(cndev)
 	    (vax_boardtype == VAX_BTYP_650) ||
 	    (vax_boardtype == VAX_BTYP_660) ||
 	    (vax_boardtype == VAX_BTYP_670) ||
-	    (vax_boardtype == VAX_BTYP_680) ||
+	    (vax_boardtype == VAX_BTYP_1301) ||
 	    (vax_boardtype == VAX_BTYP_1303)) {
 		cndev->cn_dev = makedev(25, 0);
 		cndev->cn_pri = CN_NORMAL;
diff --git a/sys/arch/vax/vax/ka680.c b/sys/arch/vax/vax/ka680.c
index 7c60a4fa529..0c39e907959 100644
--- a/sys/arch/vax/vax/ka680.c
+++ b/sys/arch/vax/vax/ka680.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ka680.c,v 1.1 2001/02/24 10:31:58 hugh Exp $	*/
+/*	$OpenBSD: ka680.c,v 1.2 2001/03/12 11:45:39 hugh Exp $	*/
 /*	$NetBSD: ka680.c,v 1.3 2001/01/28 21:01:53 ragge Exp $	*/
 /*
  * Copyright (c) 2000 Ludd, University of Lule}, Sweden.
@@ -114,9 +114,14 @@ ka680_conf()
 	hej[-1] = hej[-1];
 
 	switch((vax_siedata & 0xff00) >> 8) {
-		case VAX_STYP_675: cpuname = "KA675"; break;
-		case VAX_STYP_680: cpuname = "KA680"; break;
-		default: cpuname = "unknown NVAX";
+		case VAX_STYP_675:
+			cpuname = "KA675"; break;
+		case VAX_STYP_680:
+			cpuname = "KA680"; break;
+		case VAX_STYP_690:
+			cpuname = "KA690"; break;
+		default:
+			cpuname = "unknown NVAX";
 	}
 	printf("cpu0: %s, ucode rev %d\n", cpuname, vax_cpudata & 0xff);
 }
diff --git a/sys/arch/vax/vax/locore.c b/sys/arch/vax/vax/locore.c
index 359eb10bb3d..84b0da72d71 100644
--- a/sys/arch/vax/vax/locore.c
+++ b/sys/arch/vax/vax/locore.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.c,v 1.14 2001/02/25 15:52:21 hugh Exp $	*/
+/*	$OpenBSD: locore.c,v 1.15 2001/03/12 11:45:38 hugh Exp $	*/
 /*	$NetBSD: locore.c,v 1.43 2000/03/26 11:39:45 ragge Exp $	*/
 /*
  * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
@@ -231,13 +231,15 @@ start()
 		break;
 #endif
 #if VAX680
-	case VAX_BTYP_680:
+	case VAX_BTYP_1301:
 		dep_call = &ka680_calls;
 		switch((vax_siedata & 0xff00) >> 8) {
 		case VAX_STYP_675:
-			strcpy(cpu_model,"VAX 4000/400"); break;
+			strcpy(cpu_model,"VAX 4000 400"); break;
 		case VAX_STYP_680:
-			strcpy(cpu_model,"VAX 4000/500"); break;
+			strcpy(cpu_model,"VAX 4000 500"); break;
+		case VAX_STYP_690:
+			strcpy(cpu_model,"VAX 4000 600"); break;
 		default:
 			strcpy(cpu_model,"VAX - Unknown Omega Class");
 		}