[src/trunk]: src/sys/arch/vax/vsa Don't detect glass tty if the machine is a ...

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

details:   https://anonhg.NetBSD.org/src/rev/5b1d0deca33c
branches:  trunk
changeset: 473120:5b1d0deca33c
user:      ragge <ragge%NetBSD.org@localhost>
date:      Thu May 20 23:00:58 1999 +0000

description:
Don't detect glass tty if the machine is a workstation.
Hint from Thomas Seidmann.

diffstat:

 sys/arch/vax/vsa/dz_vsbus.c |  5 +++--
 sys/arch/vax/vsa/smg.c      |  8 +++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r cb034ceb7fa9 -r 5b1d0deca33c sys/arch/vax/vsa/dz_vsbus.c
--- a/sys/arch/vax/vsa/dz_vsbus.c       Thu May 20 21:16:57 1999 +0000
+++ b/sys/arch/vax/vsa/dz_vsbus.c       Thu May 20 23:00:58 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dz_vsbus.c,v 1.11 1999/03/27 15:33:46 ragge Exp $ */
+/*     $NetBSD: dz_vsbus.c,v 1.12 1999/05/20 23:00:58 ragge Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -145,7 +145,8 @@
 
        if (((vax_confdata & 0x80) == 0) ||/* workstation, have lkc */
            (vax_boardtype == VAX_BTYP_48))
-               config_found(self, 0, dz_print);
+               if (cn_tab->cn_pri > CN_NORMAL) /* Passed cnsl detect */
+                       config_found(self, 0, dz_print);
 }
 
 int
diff -r cb034ceb7fa9 -r 5b1d0deca33c sys/arch/vax/vsa/smg.c
--- a/sys/arch/vax/vsa/smg.c    Thu May 20 21:16:57 1999 +0000
+++ b/sys/arch/vax/vsa/smg.c    Thu May 20 23:00:58 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smg.c,v 1.15 1999/03/13 15:16:48 ragge Exp $ */
+/*     $NetBSD: smg.c,v 1.16 1999/05/20 23:00:58 ragge Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -47,6 +47,7 @@
 #include <machine/vsbus.h>
 #include <machine/sid.h>
 #include <machine/cpu.h>
+#include <machine/ka420.h>
 
 #include "lkc.h"
 
@@ -487,8 +488,9 @@
        case VAX_BTYP_410:
        case VAX_BTYP_420:
        case VAX_BTYP_43:
-               if (vax_confdata & 0x20) /* doesn't use graphics console */
-                       break;
+               if ((vax_confdata & KA420_CFG_L3CON) ||
+                   (vax_confdata & KA420_CFG_MULTU))
+                       break; /* doesn't use graphics console */
                sm_addr = (caddr_t)vax_map_physmem(SMADDR, (SMSIZE/VAX_NBPG));
                if (sm_addr == 0)
                        return 0;