[src/netbsd-1-5]: src/sys/arch/vax/vax Pull up revision 1.52 (approved by tho...

[ragge <ragge%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/416adf531c58
branches:  netbsd-1-5
changeset: 489376:416adf531c58
user:      ragge <ragge%NetBSD.org@localhost>
date:      Mon Sep 04 17:35:14 2000 +0000

description:
Pull up revision 1.52 (approved by thorpej):
Fix to correctly identify 3100/m30. From moj%stacken.kth.se@localhost.

diffstat:

 sys/arch/vax/vax/locore.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r db0c9dd66f85 -r 416adf531c58 sys/arch/vax/vax/locore.c
--- a/sys/arch/vax/vax/locore.c Mon Sep 04 16:22:58 2000 +0000
+++ b/sys/arch/vax/vax/locore.c Mon Sep 04 17:35:14 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.c,v 1.47 2000/06/12 11:13:14 ragge Exp $        */
+/*     $NetBSD: locore.c,v 1.47.2.1 2000/09/04 17:35:14 ragge Exp $    */
 /*
  * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -129,6 +129,7 @@
 #if VAX410
        case VAX_BTYP_420: /* They are very similar */
                dep_call = &ka410_calls;
+               strcat(cpu_model, "3100");
                if (((vax_siedata >> 8) & 0xff) == 1)
                        strcat(cpu_model, "/m{38,48}");
                else if (((vax_siedata >> 8) & 0xff) == 0)
@@ -155,7 +156,10 @@
 #if VAX48
        case VAX_BTYP_48:
                dep_call = &ka48_calls;
-               strcat(cpu_model, "VAXstation 4000 VLC");
+               if (vax_confdata & 0x80)
+                       strcat(cpu_model, "3100/m{30,40}");
+               else
+                       strcat(cpu_model, "4000 VLC");
                break;
 #endif
 #if VAX49