[src/netbsd-1-6]: src/sys/arch/vax/vsa Pull up revision 1.23 (requested by ra...

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

details:   https://anonhg.NetBSD.org/src/rev/6fdec76f092e
branches:  netbsd-1-6
changeset: 527869:6fdec76f092e
user:      lukem <lukem%NetBSD.org@localhost>
date:      Tue Jun 11 01:58:07 2002 +0000

description:
Pull up revision 1.23 (requested by ragge in ticket #239):
Don't try to connect a keyboard to serial line 0 if the serial console
is on line 0; it may destroy line settings.

diffstat:

 sys/arch/vax/vsa/dz_vsbus.c |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (30 lines):

diff -r b7a72bcc06d5 -r 6fdec76f092e sys/arch/vax/vsa/dz_vsbus.c
--- a/sys/arch/vax/vsa/dz_vsbus.c       Tue Jun 11 01:56:56 2002 +0000
+++ b/sys/arch/vax/vsa/dz_vsbus.c       Tue Jun 11 01:58:07 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dz_vsbus.c,v 1.22 2002/04/30 12:33:32 ragge Exp $ */
+/*     $NetBSD: dz_vsbus.c,v 1.22.4.1 2002/06/11 01:58:07 lukem Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -183,13 +183,15 @@
        DELAY(10000);
 
 #if NDZKBD > 0
-       /* Don't change speed if this is the console */
-       if (cn_tab->cn_dev != makedev(getmajor(dzopen), 0))
+       /* Don't touch this port if this is the console */
+       if (cn_tab->cn_dev != makedev(getmajor(dzopen), 0)) {
                dz->rbuf = DZ_LPR_RX_ENABLE | (DZ_LPR_B4800 << 8) 
                    | DZ_LPR_8_BIT_CHAR;
-       daa.daa_line = 0;
-       daa.daa_flags = (cn_tab->cn_pri == CN_INTERNAL ? DZKBD_CONSOLE : 0);
-       config_found(self, &daa, dz_print);
+               daa.daa_line = 0;
+               daa.daa_flags =
+                   (cn_tab->cn_pri == CN_INTERNAL ? DZKBD_CONSOLE : 0);
+               config_found(self, &daa, dz_print);
+       }
 #endif
 #if NDZMS > 0
        dz->rbuf = DZ_LPR_RX_ENABLE | (DZ_LPR_B4800 << 8) | DZ_LPR_7_BIT_CHAR \