diff options
| author | Hugh Graham <hugh@cvs.openbsd.org> | 2001-10-01 12:56:44 +0000 |
|---|---|---|
| committer | Hugh Graham <hugh@cvs.openbsd.org> | 2001-10-01 12:56:44 +0000 |
| commit | f8fec01dd26e282798c447f10de0b86ef42263d1 (patch) | |
| tree | ce1d5caeba2b0d4ab290b86aa2f898b3a8d98ccd | |
| parent | a98ad09d45e7d52dd825754ace9ede56df32339f (diff) | |
Use system variant types rather than 0x80 on the configuration and
test register to tell VAXstation 4000/60 from MicroVAX 3100m80.
This seems to produce more reliable results (should work for both
Norm's and Solar's 3100m80's).
| -rw-r--r-- | sys/arch/vax/vax/ka46.c | 12 | ||||
| -rw-r--r-- | sys/arch/vax/vax/locore.c | 16 |
2 files changed, 20 insertions, 8 deletions
diff --git a/sys/arch/vax/vax/ka46.c b/sys/arch/vax/vax/ka46.c index 819a3231996..4ba6f82e14d 100644 --- a/sys/arch/vax/vax/ka46.c +++ b/sys/arch/vax/vax/ka46.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka46.c,v 1.3 2001/09/11 20:05:25 miod Exp $ */ +/* $OpenBSD: ka46.c,v 1.4 2001/10/01 12:56:43 hugh Exp $ */ /* $NetBSD: ka46.c,v 1.12 2000/03/04 07:27:49 matt Exp $ */ /* * Copyright (c) 1998 Ludd, University of Lule}, Sweden. @@ -84,10 +84,16 @@ struct cpu_dep ka46_calls = { void ka46_conf() { - if (vax_confdata & 0x80) + switch(vax_siedata & 0xFF) { + case VAX_VTYP_47: printf("cpu: KA47\n"); - else + break; + case VAX_VTYP_46: printf("cpu: KA46\n"); + break; + default: + printf("cpu: Unknown Mariah\n"); + } ka46_cpu = (void *)vax_map_physmem(VS_REGS, 1); printf("cpu: turning on floating point chip\n"); diff --git a/sys/arch/vax/vax/locore.c b/sys/arch/vax/vax/locore.c index 37d089a329e..fb75881d263 100644 --- a/sys/arch/vax/vax/locore.c +++ b/sys/arch/vax/vax/locore.c @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.c,v 1.18 2001/08/26 11:48:06 hugh Exp $ */ +/* $OpenBSD: locore.c,v 1.19 2001/10/01 12:56:43 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. @@ -146,10 +146,16 @@ start() #if VAX46 case VAX_BTYP_46: dep_call = &ka46_calls; - if (vax_confdata & 0x80) - strcat(cpu_model, "3100/80"); - else - strcat(cpu_model, "4000/60"); + switch(vax_siedata & 0xFF) { + case VAX_VTYP_47: + strcpy(cpu_model, "MicroVAX 3100 m80"); + break; + case VAX_VTYP_46: + strcpy(cpu_model, "VAXstation 4000/60"); + break; + default: + strcat(cpu_model, " - Unknown Mariah"); + } break; #endif #if VAX48 |