diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2005-06-02 07:31:18 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-06-02 07:31:18 +0000 |
| commit | 68d44aa9ee42fd0c63b21665ae03db92b4deeee8 (patch) | |
| tree | d67a6ab46d67e6aaf7778c671597ff1bc4918ea5 /sys/dev | |
| parent | 232937a7c65ef1af4dbb275c322700e93417021a (diff) | |
Do not compile scrollback support if option SMALL_KERNEL.
ok deraadt@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/wscons/wsdisplay.c | 5 | ||||
| -rw-r--r-- | sys/dev/wscons/wskbd.c | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c index ad55c572230..cdd69418661 100644 --- a/sys/dev/wscons/wsdisplay.c +++ b/sys/dev/wscons/wsdisplay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsdisplay.c,v 1.58 2005/05/18 21:31:27 miod Exp $ */ +/* $OpenBSD: wsdisplay.c,v 1.59 2005/06/02 07:31:17 miod Exp $ */ /* $NetBSD: wsdisplay.c,v 1.82 2005/02/27 00:27:52 perry Exp $ */ /* @@ -34,6 +34,7 @@ #ifndef SMALL_KERNEL #define WSMOUSED_SUPPORT #define BURNER_SUPPORT +#define SCROLLBACK_SUPPORT #endif #include <sys/param.h> @@ -2050,6 +2051,7 @@ wsdisplay_switchtoconsole() } } +#ifdef SCROLLBACK_SUPPORT void wsscrollback(void *arg, int op) { @@ -2069,6 +2071,7 @@ wsscrollback(void *arg, int op) sc->sc_focus->scr_dconf->emulcookie, lines); } } +#endif #ifdef BURNER_SUPPORT void diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c index 82368f82d19..103310a52df 100644 --- a/sys/dev/wscons/wskbd.c +++ b/sys/dev/wscons/wskbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wskbd.c,v 1.43 2005/05/18 21:31:27 miod Exp $ */ +/* $OpenBSD: wskbd.c,v 1.44 2005/06/02 07:31:17 miod Exp $ */ /* $NetBSD: wskbd.c,v 1.80 2005/05/04 01:52:16 augustss Exp $ */ /* @@ -81,6 +81,7 @@ #ifndef SMALL_KERNEL #define BURNER_SUPPORT +#define SCROLLBACK_SUPPORT #endif #include <sys/param.h> @@ -602,11 +603,13 @@ wskbd_input(struct device *dev, u_int type, int value) num = wskbd_translate(sc->id, type, value); if (num > 0) { if (sc->sc_base.me_dispdv != NULL) { +#ifdef SCROLLBACK_SUPPORT /* XXX - Shift_R+PGUP(release) emits PrtSc */ if (sc->id->t_symbols[0] != KS_Print_Screen) { wsscrollback(sc->sc_base.me_dispdv, WSDISPLAY_SCROLL_RESET); } +#endif for (i = 0; i < num; i++) { wsdisplay_kbdinput(sc->sc_base.me_dispdv, sc->id->t_symbols[i]); @@ -1375,6 +1378,7 @@ internal_command(struct wskbd_softc *sc, u_int *type, keysym_t ksym, if (*type != WSCONS_EVENT_KEY_DOWN) return (0); +#ifdef SCROLLBACK_SUPPORT #if NWSDISPLAY > 0 switch (ksym) { case KS_Cmd_ScrollBack: @@ -1396,6 +1400,7 @@ internal_command(struct wskbd_softc *sc, u_int *type, keysym_t ksym, break; } #endif +#endif if (!MOD_ONESET(sc->id, MOD_COMMAND) && !MOD_ALLSET(sc->id, MOD_COMMAND1 | MOD_COMMAND2)) |