summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugh Graham <hugh@cvs.openbsd.org>2001-02-25 15:52:22 +0000
committerHugh Graham <hugh@cvs.openbsd.org>2001-02-25 15:52:22 +0000
commit9354c0d509645b9838903e3fca9cb2961506dd96 (patch)
tree357cf82ceb6cc788e3b62d076fc4d1ae7b4444ed
parentb8f85ce91dfbe597b680629385ccdbc8cb7a6c3e (diff)
Use the system subtype field on the SIE to determine if a machine is
VS4000/vlc or MV3100/{3,4}0. This seems to produce more consistent detection than checking the configuration and test register.
-rw-r--r--sys/arch/vax/vax/locore.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/sys/arch/vax/vax/locore.c b/sys/arch/vax/vax/locore.c
index de9d48cc143..359eb10bb3d 100644
--- a/sys/arch/vax/vax/locore.c
+++ b/sys/arch/vax/vax/locore.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore.c,v 1.13 2001/02/24 10:31:58 hugh Exp $ */
+/* $OpenBSD: locore.c,v 1.14 2001/02/25 15:52:21 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.
@@ -152,10 +152,16 @@ start()
#if VAX48
case VAX_BTYP_48:
dep_call = &ka48_calls;
- if (vax_confdata & 0x80)
+ switch((vax_siedata >> 8) & 0xFF) {
+ case VAX_STYP_45:
strcat(cpu_model, "3100/m{30,40}");
- else
- strcat(cpu_model, "4000 VLC");
+ break;
+ case VAX_STYP_48:
+ strcpy(cpu_model, "VAXstation 4000/VLC");
+ break;
+ default:
+ strcat(cpu_model, " - Unknown SOC");
+ }
break;
#endif
#if VAX49