diff options
| author |   hugh <hugh@openbsd.org> | 2001-01-30 17:10:05 +0000 |
|---|---|---|
| committer | hugh <hugh@openbsd.org> | 2001-01-30 17:10:05 +0000 |
| commit | 3820c07f9b45c532802ca8106ec9de7e2fb93e31 (patch) | |
| tree | 61102b535410d32993692716ce27046dfdd7dfdd | |
| parent | Update with SIE data provided by: (diff) | |
| download | wireguard-openbsd-3820c07f9b45c532802ca8106ec9de7e2fb93e31.tar.xz wireguard-openbsd-3820c07f9b45c532802ca8106ec9de7e2fb93e31.zip | |
Improve printing of various NVAX models. Similar to work by Michael Kukat.
| -rw-r--r-- | sys/arch/vax/vax/findcpu.c | 4 | ||||
| -rw-r--r-- | sys/arch/vax/vax/ka53.c | 22 | ||||
| -rw-r--r-- | sys/arch/vax/vax/locore.c | 17 |
3 files changed, 37 insertions, 6 deletions
diff --git a/sys/arch/vax/vax/findcpu.c b/sys/arch/vax/vax/findcpu.c index 46bc18fe75b..2b33cb55bd0 100644 --- a/sys/arch/vax/vax/findcpu.c +++ b/sys/arch/vax/vax/findcpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: findcpu.c,v 1.4 2001/01/28 02:24:25 hugh Exp $ */ +/* $OpenBSD: findcpu.c,v 1.5 2001/01/30 17:10:05 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. @@ -105,9 +105,9 @@ findcpu() case VAX_BTYP_670: case VAX_BTYP_660: case VAX_BTYP_60: - case VAX_BTYP_69D: case VAX_BTYP_630: case VAX_BTYP_650: + case VAX_BTYP_680: case VAX_BTYP_1303: vax_bustype = VAX_IBUS; break; diff --git a/sys/arch/vax/vax/ka53.c b/sys/arch/vax/vax/ka53.c index f8649796769..d8402edd627 100644 --- a/sys/arch/vax/vax/ka53.c +++ b/sys/arch/vax/vax/ka53.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka53.c,v 1.1 2001/01/28 01:18:07 hugh Exp $ */ +/* $OpenBSD: ka53.c,v 1.2 2001/01/30 17:10:05 hugh Exp $ */ /* $NetBSD: ka53.c,v 1.2 2000/06/04 02:19:27 matt Exp $ */ /* * Copyright (c) 2000 Ludd, University of Lule}, Sweden. @@ -75,13 +75,31 @@ struct cpu_dep ka53_calls = { void ka53_conf() { - printf("cpu0: KA53, ucode rev %d\n", vax_cpudata & 0xff); + char *cpuname; /* This initialises ISP, avoiding interrupt exceptions */ {volatile int *hej = (void *)mfpr(PR_ISP); *hej = *hej; hej[-1] = hej[-1];} /* This vector (qbus related?) comes out of nowhere, ignore it for now */ scb_vecalloc(0x0, (void *)nullop, 0, SCB_ISTACK); + + switch((vax_siedata >> 8) & 0xFF) { + case VAX_STYP_50: + cpuname = "KA50"; + break; + case VAX_STYP_51: + cpuname = "KA51"; + break; + case VAX_STYP_52: + cpuname = "KA52"; + break; + case VAX_STYP_53: + cpuname = "KA53"; + 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 df3232e9274..d3aeffb4dee 100644 --- a/sys/arch/vax/vax/locore.c +++ b/sys/arch/vax/vax/locore.c @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.c,v 1.11 2000/10/10 18:21:28 bjc Exp $ */ +/* $OpenBSD: locore.c,v 1.12 2001/01/30 17:10:05 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. @@ -166,7 +166,20 @@ start() #if VAX53 case VAX_BTYP_1303: dep_call = &ka53_calls; - strcat(cpu_model, "4000/{100,105A}"); + switch((vax_siedata >> 8) & 0xFF) { + case VAX_STYP_51: + strcpy(cpu_model, "MicroVAX 3100 model 90 or 95"); + break; + case VAX_STYP_52: + strcpy(cpu_model, "VAX 4000 100"); + break; + case VAX_STYP_53: + strcpy(cpu_model, "VAX 4000 105A"); + break; + case VAX_STYP_50: + default: + strcpy(cpu_model, "VAX - Unknown Cheetah Class"); + } break; #endif #if VAX630 |