[src/trunk]: src/sys/arch/sun2/dev Only declare the console keyboard on zs if...

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

details:   https://anonhg.NetBSD.org/src/rev/e06f00d9857c
branches:  trunk
changeset: 518221:e06f00d9857c
user:      fredette <fredette%NetBSD.org@localhost>
date:      Mon Nov 26 18:06:36 2001 +0000

description:
Only declare the console keyboard on zs if it's a Sun-2
or later keyboard.

diffstat:

 sys/arch/sun2/dev/zs_any.c |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r c5833a643c5c -r e06f00d9857c sys/arch/sun2/dev/zs_any.c
--- a/sys/arch/sun2/dev/zs_any.c        Mon Nov 26 18:01:05 2001 +0000
+++ b/sys/arch/sun2/dev/zs_any.c        Mon Nov 26 18:06:36 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zs_any.c,v 1.4 2001/06/27 17:41:03 fredette Exp $      */
+/*     $NetBSD: zs_any.c,v 1.5 2001/11/26 18:06:36 fredette Exp $      */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -72,6 +72,7 @@
 
 #include <sun2/sun2/machdep.h>
 #include <dev/ic/z8530reg.h>
+#include <dev/sun/kbd_reg.h>
 
 /****************************************************************
  * Autoconfig
@@ -168,7 +169,12 @@
        else
                cookie = -1;
 
-       if (cookie == prom_stdin())
+       /*
+        * We have the console keyboard only if it's a Sun-2 
+        * keyboard or better. (i.e., not a Sun-1 parallel kbd).
+        */
+       if (cookie == prom_stdin() &&
+           (cookie != PROMDEV_KBD || prom_kbdid() >= KB_SUN2))
                flags |= ZS_HWFLAG_CONSOLE_INPUT;
 
        /*