[src/netbsd-2-0]: src/sys/dev/wscons Pull up revision 1.75 (requested by rech...

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

details:   https://anonhg.NetBSD.org/src/rev/b5d3957ca540
branches:  netbsd-2-0
changeset: 561312:b5d3957ca540
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Jun 07 09:48:52 2004 +0000

description:
Pull up revision 1.75 (requested by recht in ticket #451):
fix scrolling code that was not ifdefed.

diffstat:

 sys/dev/wscons/wskbd.c |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (43 lines):

diff -r 098bbc51b00d -r b5d3957ca540 sys/dev/wscons/wskbd.c
--- a/sys/dev/wscons/wskbd.c    Mon Jun 07 09:47:25 2004 +0000
+++ b/sys/dev/wscons/wskbd.c    Mon Jun 07 09:48:52 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbd.c,v 1.73.2.1 2004/06/07 09:37:58 tron Exp $ */
+/* $NetBSD: wskbd.c,v 1.73.2.2 2004/06/07 09:48:52 tron Exp $ */
 
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.73.2.1 2004/06/07 09:37:58 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.73.2.2 2004/06/07 09:48:52 tron Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -611,10 +611,12 @@
                num = wskbd_translate(sc->id, type, value);
                if (num > 0) {
                        if (sc->sc_base.me_dispdv != NULL) {
+#ifdef WSDISPLAY_SCROLLSUPPORT
                                if (sc->id->t_symbols [0] != KS_Print_Screen) {
-                                       wsdisplay_scroll (sc->sc_base.
+                                       wsdisplay_scroll(sc->sc_base.
                                        me_dispdv, WSDISPLAY_SCROLL_RESET);
                                }
+#endif
                                for (i = 0; i < num; i++)
                                        wsdisplay_kbdinput(
                                                sc->sc_base.me_dispdv,
@@ -1383,7 +1385,9 @@
 internal_command(struct wskbd_softc *sc, u_int *type, keysym_t ksym,
        keysym_t ksym2)
 {
-       u_int state=0;
+#ifdef WSDISPLAY_SCROLLSUPPORT
+       u_int state = 0;
+#endif
        switch (ksym) {
 #ifdef WSDISPLAY_SCROLLSUPPORT
        case KS_Cmd_ScrollFastUp: