[src/trunk]: src/sys/arch/vax/vsa Change console detection a little bit.

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

details:   https://anonhg.NetBSD.org/src/rev/0a8c9918bd18
branches:  trunk
changeset: 467710:0a8c9918bd18
user:      ragge <ragge%NetBSD.org@localhost>
date:      Sat Mar 27 15:33:46 1999 +0000

description:
Change console detection a little bit.

diffstat:

 sys/arch/vax/vsa/dz_vsbus.c |  33 +++++++++++++++------------------
 1 files changed, 15 insertions(+), 18 deletions(-)

diffs (62 lines):

diff -r 26607ba25d46 -r 0a8c9918bd18 sys/arch/vax/vsa/dz_vsbus.c
--- a/sys/arch/vax/vsa/dz_vsbus.c       Sat Mar 27 15:31:50 1999 +0000
+++ b/sys/arch/vax/vsa/dz_vsbus.c       Sat Mar 27 15:33:46 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dz_vsbus.c,v 1.10 1999/03/26 22:04:07 ragge Exp $ */
+/*     $NetBSD: dz_vsbus.c,v 1.11 1999/03/27 15:33:46 ragge Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -178,38 +178,35 @@
        struct  consdev *cndev;
 {
        extern  vaddr_t iospace;
-       int pri = CN_NORMAL, min = 0;
+       int diagcons;
 
        switch (vax_boardtype) {
        case VAX_BTYP_410:
        case VAX_BTYP_420:
        case VAX_BTYP_43:
-               if (vax_confdata & 0x20) {
-                       min = 3;
-                       pri = CN_REMOTE;
-               }
+               diagcons = (vax_confdata & 0x20 ? 3 : 0);
                break;
 
        case VAX_BTYP_46:
-               /* if (vax_confdata & 0x100) */
-                       min = 3;
+       case VAX_BTYP_48:
+               diagcons = (vax_confdata & 0x100 ? 3 : 0);
                break;
 
        case VAX_BTYP_49:
-       case VAX_BTYP_48:
-               min = 3;
+               diagcons = 3;
                break;
 
        default:
-               pri = CN_DEAD;
-               break;
+               cndev->cn_pri = CN_DEAD;
+               return;
        }
-       cndev->cn_pri = pri;
-       if (pri != CN_DEAD) {
-               cndev->cn_dev = makedev(DZMAJOR, min);
-               dz_regs = iospace;
-               ioaccess(iospace, 0x200A0000, 1);
-       }
+       if (diagcons)
+               cndev->cn_pri = CN_REMOTE;
+       else
+               cndev->cn_pri = CN_NORMAL;
+       cndev->cn_dev = makedev(DZMAJOR, diagcons);
+       dz_regs = iospace;
+       ioaccess(iospace, 0x200A0000, 1);
 }
 
 void