diff options
| -rw-r--r-- | sys/dev/pckbc/files.pckbc | 4 | ||||
| -rw-r--r-- | sys/dev/wscons/files.wscons | 6 | ||||
| -rw-r--r-- | sys/dev/wscons/wskbd.c | 20 |
3 files changed, 17 insertions, 13 deletions
diff --git a/sys/dev/pckbc/files.pckbc b/sys/dev/pckbc/files.pckbc index 5dc437b2673..4c60d9b9b42 100644 --- a/sys/dev/pckbc/files.pckbc +++ b/sys/dev/pckbc/files.pckbc @@ -1,8 +1,8 @@ -# $OpenBSD: files.pckbc,v 1.4 2005/03/08 20:00:25 tdeval Exp $ +# $OpenBSD: files.pckbc,v 1.5 2006/08/14 15:55:59 miod Exp $ # $NetBSD: files.pckbc,v 1.6 1999/01/23 16:05:56 drochner Exp $ # devices attached at pckbc, for use with wscons -device pckbd: wskbddev +device pckbd: wskbddev, wskbd_hotkey attach pckbd at pckbc file dev/pckbc/pckbd.c pckbd needs-flag file dev/pckbc/wskbdmap_mfii.c pckbd diff --git a/sys/dev/wscons/files.wscons b/sys/dev/wscons/files.wscons index 095516eabba..c84b9363020 100644 --- a/sys/dev/wscons/files.wscons +++ b/sys/dev/wscons/files.wscons @@ -1,4 +1,4 @@ -# $OpenBSD: files.wscons,v 1.12 2006/08/06 13:07:00 miod Exp $ +# $OpenBSD: files.wscons,v 1.13 2006/08/14 15:56:02 miod Exp $ # $NetBSD: files.wscons,v 1.34 2005/05/04 01:52:16 augustss Exp $ # @@ -18,6 +18,7 @@ device wsdisplay #tty? attach wsdisplay at wsemuldisplaydev with wsdisplay_emul device wskbd attach wskbd at wskbddev +define wskbd_hotkey device wsmouse attach wsmouse at wsmousedev @@ -33,7 +34,8 @@ file dev/wscons/wsevent.c wsdisplay | wskbd | wsmouse | wsmux file dev/wscons/wskbd.c wskbd needs-flag file dev/wscons/wskbdutil.c wskbd -file dev/wscons/wskbd_hotkey.c wskbd & !small_kernel +file dev/wscons/wskbd_hotkey.c wskbd & wskbd_hotkey & + !small_kernel needs-flag file dev/wscons/wsmouse.c wsmouse needs-flag pseudo-device wsmux diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c index 304db699084..7c39a8bff9f 100644 --- a/sys/dev/wscons/wskbd.c +++ b/sys/dev/wscons/wskbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wskbd.c,v 1.51 2006/08/06 11:36:35 miod Exp $ */ +/* $OpenBSD: wskbd.c,v 1.52 2006/08/14 15:56:02 miod Exp $ */ /* $NetBSD: wskbd.c,v 1.80 2005/05/04 01:52:16 augustss Exp $ */ /* @@ -79,12 +79,6 @@ * to `wscons_events' and passes them up to the appropriate reader. */ -#ifndef SMALL_KERNEL -#define BURNER_SUPPORT -#define SCROLLBACK_SUPPORT -#define HOTKEY_SUPPORT -#endif - #include <sys/param.h> #include <sys/conf.h> #include <sys/device.h> @@ -113,8 +107,16 @@ #include "audio.h" /* NAUDIO (mixer tuning) */ #include "wsdisplay.h" +#include "wskbd.h" #include "wsmux.h" +#ifndef SMALL_KERNEL +#define BURNER_SUPPORT +#define SCROLLBACK_SUPPORT +#undef NWSKBD_HOTKEY +#define NWSKBD_HOTKEY 0 +#endif + #ifdef WSKBD_DEBUG #define DPRINTF(x) if (wskbddebug) printf x int wskbddebug = 0; @@ -449,7 +451,7 @@ wskbd_attach(struct device *parent, struct device *self, void *aux) } #endif -#ifdef HOTKEY_SUPPORT +#if NWSKBD_HOTKEY > 0 wskbd_hotkey_init(); #endif } @@ -1640,7 +1642,7 @@ wskbd_translate(struct wskbd_internal *id, u_int type, int value) } } -#ifdef HOTKEY_SUPPORT +#if NWSKBD_HOTKEY > 0 /* Submit Audio keys for hotkey processing */ if (KS_GROUP(ksym) == KS_GROUP_Function) { switch (ksym) { |