diff options
| author | Hugh Graham <hugh@cvs.openbsd.org> | 2002-07-21 09:17:15 +0000 |
|---|---|---|
| committer | Hugh Graham <hugh@cvs.openbsd.org> | 2002-07-21 09:17:15 +0000 |
| commit | 3110c969d5f8139c513bfb03fc7e84a86e0d2a0f (patch) | |
| tree | bd13fdc3642f9f8bb7b0e59a0fbe3698a3320323 | |
| parent | 1f05f59c77fab69f1881ab474df18b884e0e599c (diff) | |
Attempt to distinguish 4000 700A from 4000 705A. Results are so far
consistent with SID/XSID data from Mats O Jansson, Chuck McManis,
Antonio Carlini, Fred van Kempen, and Kees Stravers.
Tested by Fred van Kempen.
| -rw-r--r-- | sys/arch/vax/vax/ka680.c | 7 | ||||
| -rw-r--r-- | sys/arch/vax/vax/locore.c | 27 |
2 files changed, 21 insertions, 13 deletions
diff --git a/sys/arch/vax/vax/ka680.c b/sys/arch/vax/vax/ka680.c index 957b28f6950..f4048d83827 100644 --- a/sys/arch/vax/vax/ka680.c +++ b/sys/arch/vax/vax/ka680.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka680.c,v 1.8 2002/03/14 01:26:48 millert Exp $ */ +/* $OpenBSD: ka680.c,v 1.9 2002/07/21 09:17:14 hugh Exp $ */ /* $NetBSD: ka680.c,v 1.3 2001/01/28 21:01:53 ragge Exp $ */ /* * Copyright (c) 2000 Ludd, University of Lule}, Sweden. @@ -137,7 +137,10 @@ ka680_conf() cpuname = "KA691"; break; case VAX_STYP_694: - cpuname = "KA694"; + if (vax_cpudata & 0x1000) + cpuname = "KA694"; + else + cpuname = "KA692"; break; default: cpuname = "unknown NVAX 1305"; diff --git a/sys/arch/vax/vax/locore.c b/sys/arch/vax/vax/locore.c index c8df12d954d..ae3f7312fcc 100644 --- a/sys/arch/vax/vax/locore.c +++ b/sys/arch/vax/vax/locore.c @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.c,v 1.24 2002/06/11 09:36:24 hugh Exp $ */ +/* $OpenBSD: locore.c,v 1.25 2002/07/21 09:17:14 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. @@ -233,46 +233,51 @@ start(struct rpb *prpb) #if VAX660 case VAX_BTYP_660: dep_call = &ka660_calls; - strcpy(cpu_model,"VAX 4000/200"); + strcpy(cpu_model,"VAX 4000 200"); break; #endif #if VAX670 case VAX_BTYP_670: dep_call = &ka670_calls; - strcpy(cpu_model,"VAX 4000/300"); + strcpy(cpu_model,"VAX 4000 300"); break; #endif #if VAX680 case VAX_BTYP_1301: dep_call = &ka680_calls; + strcpy(cpu_model,"VAX 4000 "); switch((vax_siedata & 0xff00) >> 8) { case VAX_STYP_675: - strcpy(cpu_model,"VAX 4000 400"); + strcat(cpu_model,"400"); break; case VAX_STYP_680: - strcpy(cpu_model,"VAX 4000 500"); + strcat(cpu_model,"500"); break; case VAX_STYP_690: - strcpy(cpu_model,"VAX 4000 600"); + strcat(cpu_model,"600"); break; default: - strcpy(cpu_model,"VAX - Unknown Omega Class"); + strcat(cpu_model,"- Unknown Omega Class"); } break; case VAX_BTYP_1305: dep_call = &ka680_calls; + strcpy(cpu_model,"VAX 4000 "); switch((vax_siedata & 0xff00) >> 8) { case VAX_STYP_681: - strcpy(cpu_model,"VAX 4000 500A"); + strcat(cpu_model,"500A"); break; case VAX_STYP_691: - strcpy(cpu_model,"VAX 4000 605A"); + strcat(cpu_model,"605A"); break; case VAX_STYP_694: - strcpy(cpu_model,"VAX 4000 705A"); + if (vax_cpudata & 0x1000) + strcat(cpu_model,"705A"); + else + strcat(cpu_model,"700A"); break; default: - strcpy(cpu_model,"VAX - Unknown Legacy Class"); + strcat(cpu_model,"- Unknown Legacy Class"); } break; #endif |