[src/trunk]: src/sys/dev/wscons PR kern/38900 Arnaud Lacombe: don't try to do...

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

details:   https://anonhg.NetBSD.org/src/rev/077b7a950eef
branches:  trunk
changeset: 755281:077b7a950eef
user:      dholland <dholland%NetBSD.org@localhost>
date:      Mon May 31 04:27:18 2010 +0000

description:
PR kern/38900 Arnaud Lacombe: don't try to do WSDISPLAY_SCROLLSUPPORT
things if NWSDISPLAY is 0.

Arguably the right fix is to not allow "options WSDISPLAY_SCROLLSUPPORT"
to be enabled in this case, but AIUI config doesn't know how to encode
rules like that.

diffstat:

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

diffs (36 lines):

diff -r 1e3784a1c2b2 -r 077b7a950eef sys/dev/wscons/wskbd.c
--- a/sys/dev/wscons/wskbd.c    Mon May 31 03:18:33 2010 +0000
+++ b/sys/dev/wscons/wskbd.c    Mon May 31 04:27:18 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbd.c,v 1.127 2010/02/24 22:38:09 dyoung Exp $ */
+/* $NetBSD: wskbd.c,v 1.128 2010/05/31 04:27:18 dholland Exp $ */
 
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
@@ -105,7 +105,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.127 2010/02/24 22:38:09 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.128 2010/05/31 04:27:18 dholland Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -1507,7 +1507,7 @@
 internal_command(struct wskbd_softc *sc, u_int *type, keysym_t ksym,
        keysym_t ksym2)
 {
-#ifdef WSDISPLAY_SCROLLSUPPORT
+#if NWSDISPLAY > 0 && defined(WSDISPLAY_SCROLLSUPPORT)
        u_int state = 0;
 #endif
        switch (ksym) {
@@ -1523,7 +1523,7 @@
                if (*type == WSCONS_EVENT_KEY_DOWN)
                        pmf_event_inject(NULL, PMFE_AUDIO_VOLUME_DOWN);
                break;
-#ifdef WSDISPLAY_SCROLLSUPPORT
+#if NWSDISPLAY > 0 && defined(WSDISPLAY_SCROLLSUPPORT)
        case KS_Cmd_ScrollFastUp:
        case KS_Cmd_ScrollFastDown:
                if (*type == WSCONS_EVENT_KEY_DOWN) {