summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugh Graham <hugh@cvs.openbsd.org>2001-03-16 22:46:27 +0000
committerHugh Graham <hugh@cvs.openbsd.org>2001-03-16 22:46:27 +0000
commit7049fe0c176e75d73e43c326f1438a16dcc7b07d (patch)
treedcbb542ed5ad04138dbcd1364e14874dbf65ee8c
parentcdc3ded5cf05f2c9815425bb442656fca9ca6b0e (diff)
Add some more model subtypes from Antonio Carlini.
Won't try to match VAX_STYP_692 until we can find a 4000 70x and learn more about this model.
-rw-r--r--sys/arch/vax/include/sid.h5
-rw-r--r--sys/arch/vax/vax/ka680.c6
-rw-r--r--sys/arch/vax/vax/locore.c6
3 files changed, 14 insertions, 3 deletions
diff --git a/sys/arch/vax/include/sid.h b/sys/arch/vax/include/sid.h
index e34a8bc9067..8ff2a439353 100644
--- a/sys/arch/vax/include/sid.h
+++ b/sys/arch/vax/include/sid.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sid.h,v 1.9 2001/03/12 11:45:35 hugh Exp $ */
+/* $OpenBSD: sid.h,v 1.10 2001/03/16 22:46:25 hugh Exp $ */
/* $NetBSD: sid.h,v 1.12 1999/12/11 17:55:13 ragge Exp $ */
/*
@@ -160,7 +160,10 @@
#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_681 0x00000e /* VAX 4000 model 500A */
#define VAX_STYP_690 0x000007 /* VAX 4000 model 600 */
+#define VAX_STYP_691 0x00000f /* VAX 4000 model 605A */
+#define VAX_STYP_692 0x000010 /* VAX 4000 model 700? */
#define VAX_BTYP_1302 0x13000002
diff --git a/sys/arch/vax/vax/ka680.c b/sys/arch/vax/vax/ka680.c
index 0c39e907959..6a2714191ac 100644
--- a/sys/arch/vax/vax/ka680.c
+++ b/sys/arch/vax/vax/ka680.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ka680.c,v 1.2 2001/03/12 11:45:39 hugh Exp $ */
+/* $OpenBSD: ka680.c,v 1.3 2001/03/16 22:46:26 hugh Exp $ */
/* $NetBSD: ka680.c,v 1.3 2001/01/28 21:01:53 ragge Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden.
@@ -118,8 +118,12 @@ ka680_conf()
cpuname = "KA675"; break;
case VAX_STYP_680:
cpuname = "KA680"; break;
+ case VAX_STYP_681:
+ cpuname = "KA681"; break;
case VAX_STYP_690:
cpuname = "KA690"; break;
+ case VAX_STYP_691:
+ cpuname = "KA691"; break;
default:
cpuname = "unknown NVAX";
}
diff --git a/sys/arch/vax/vax/locore.c b/sys/arch/vax/vax/locore.c
index 84b0da72d71..3cea19a404e 100644
--- a/sys/arch/vax/vax/locore.c
+++ b/sys/arch/vax/vax/locore.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore.c,v 1.15 2001/03/12 11:45:38 hugh Exp $ */
+/* $OpenBSD: locore.c,v 1.16 2001/03/16 22:46:26 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.
@@ -238,8 +238,12 @@ start()
strcpy(cpu_model,"VAX 4000 400"); break;
case VAX_STYP_680:
strcpy(cpu_model,"VAX 4000 500"); break;
+ case VAX_STYP_681:
+ strcpy(cpu_model,"VAX 4000 500A"); break;
case VAX_STYP_690:
strcpy(cpu_model,"VAX 4000 600"); break;
+ case VAX_STYP_691:
+ strcpy(cpu_model,"VAX 4000 605A"); break;
default:
strcpy(cpu_model,"VAX - Unknown Omega Class");
}