 @@ -1,14 +1,14 @@
-/* $NetBSD: wskbd.c,v 1.131 2012/03/13 18:40:34 elad Exp $ */
+/* $NetBSD: wskbd.c,v 1.132 2012/08/29 02:38:31 macallan Exp $ */
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -95,27 +95,27 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)kbd.c	8.2 (Berkeley) 10/30/93
  */
 /*
  * Keyboard driver (/dev/wskbd*).  Translates incoming bytes to ASCII or
  * to `wscons_events' and passes them up to the appropriate reader.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.131 2012/03/13 18:40:34 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.132 2012/08/29 02:38:31 macallan Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_wsdisplay_compat.h"
 #include "wsdisplay.h"
 #include "wskbd.h"
 #include "wsmux.h"
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 @@ -197,26 +197,30 @@ struct wskbd_softc {
 	int	sc_repeat_value;
 	int	sc_translating;		/* xlate to chars for emulation */
 	int	sc_maplen;		/* number of entries in sc_map */
 	struct wscons_keymap *sc_map;	/* current translation map */
 	kbd_t sc_layout; /* current layout */
 	int		sc_refcnt;
 	u_char		sc_dying;	/* device is being detached */
 	wskbd_hotkey_plugin *sc_hotkey;
 	void *sc_hotkeycookie;
 	/* optional table to translate scancodes in event mode */
 	int		sc_evtrans_len;
 	keysym_t	*sc_evtrans;
 };
 #define MOD_SHIFT_L		(1 << 0)
 #define MOD_SHIFT_R		(1 << 1)
 #define MOD_SHIFTLOCK		(1 << 2)
 #define MOD_CAPSLOCK		(1 << 3)
 #define MOD_CONTROL_L		(1 << 4)
 #define MOD_CONTROL_R		(1 << 5)
 #define MOD_META_L		(1 << 6)
 #define MOD_META_R		(1 << 7)
 #define MOD_MODESHIFT		(1 << 8)
 #define MOD_NUMLOCK		(1 << 9)
 #define MOD_COMPOSE		(1 << 10)
 @@ -408,26 +412,28 @@ wskbd_match(device_t parent, cfdata_t ma
 void
 wskbd_attach(device_t parent, device_t self, void *aux)
+{
 	struct wskbd_softc *sc = device_private(self);
 	struct wskbddev_attach_args *ap = aux;
 #if NWSMUX > 0
 	int mux, error;
 #endif
  	sc->sc_base.me_dv = self;
 	sc->sc_isconsole = ap->console;
 	sc->sc_hotkey = NULL;
 	sc->sc_hotkeycookie = NULL;
 	sc->sc_evtrans_len = 0;
 	sc->sc_evtrans = NULL;
 #if NWSMUX > 0 || NWSDISPLAY > 0
 	sc->sc_base.me_ops = &wskbd_srcops;
 #endif
 #if NWSMUX > 0
 	mux = device_cfdata(sc->sc_base.me_dv)->wskbddevcf_mux;
 	if (ap->console) {
 		/* Ignore mux for console; it always goes to the console mux. */
 		/* printf(" (mux %d ignored for console)", mux); */
 		mux = -1;
+	}
 	if (mux >= 0)
 		aprint_normal(" mux %d", mux);
 @@ -734,27 +740,37 @@ wskbd_deliver_event(struct wskbd_softc *
 	if (evar == NULL) {
 		DPRINTF(("wskbd_input: not open\n"));
 		return;
+	}
 #ifdef DIAGNOSTIC
 	if (evar->q == NULL) {
 		printf("wskbd_input: evar->q=NULL\n");
 		return;
+	}
 #endif
 	event.type = type;
-	event.value = value;
+	event.value = 0;
 	DPRINTF(("%d ->", value));
 	if (sc->sc_evtrans_len > 0) {
 		if (sc->sc_evtrans_len > value) {
 			DPRINTF(("%d", sc->sc_evtrans[value]));
 			event.value = sc->sc_evtrans[value];
+		}
 	} else {
 		event.value = value;
+	}
 	DPRINTF(("\n"));
 	if (wsevent_inject(evar, &event, 1) != 0)
 		log(LOG_WARNING, "%s: event queue overflow\n",
 		    device_xname(sc->sc_base.me_dv));
+}
 #ifdef WSDISPLAY_COMPAT_RAWKBD
 void
 wskbd_rawinput(device_t dev, u_char *tbuf, int len)
+{
 #if NWSDISPLAY > 0
 	struct wskbd_softc *sc = device_private(dev);
 	int i;
 @@ -1868,13 +1884,23 @@ wskbd_translate(struct wskbd_internal *i
 		if (MOD_ONESET(id, MOD_ANYMETA)) {
 			if (id->t_flags & WSKFL_METAESC) {
 				id->t_symbols[0] = KS_Escape;
 				id->t_symbols[1] = res;
 				return (2);
 			} else
 				res |= 0x80;
+		}
+	}
 	id->t_symbols[0] = res;
 	return (1);
+}
 void
 wskbd_set_evtrans(device_t dev, keysym_t *tab, int len)
+{
 	struct wskbd_softc *sc = device_private(dev);
 	sc->sc_evtrans_len = len;
 	sc->sc_evtrans = tab;
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: wskbdvar.h,v 1.17 2010/10/26 05:12:34 jruoho Exp $ */
+/* $NetBSD: wskbdvar.h,v 1.18 2012/08/29 02:38:31 macallan Exp $ */
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -93,18 +93,25 @@ void	wskbd_input(device_t, u_int, int);
 void	wskbd_rawinput(device_t, u_char *, int);
 /*
  * Callbacks for (ACPI) hotkey drivers which generate
  * keycodes.
  */
 struct wskbd_softc;
 typedef int (wskbd_hotkey_plugin)(struct wskbd_softc *, void *, u_int, int);
 device_t wskbd_hotkey_register(device_t, void *, wskbd_hotkey_plugin *);
 void	 wskbd_hotkey_deregister(device_t);
 /*
  * set a translation table for scancodes in event mode
  * parameters are a pointer to the table and its length
  * pass length zero to turn translation off
  */
 void	wskbd_set_evtrans(device_t, keysym_t *, int);
 /*
  * Console interface.
  */
 int	wskbd_cngetc(dev_t);
 void	wskbd_cnpollc(dev_t, int);
 void	wskbd_cnbell(dev_t, u_int, u_int, u_int);