 @@ -1,14 +1,14 @@
-/*      $NetBSD: ukbd.c,v 1.112 2011/11/02 08:49:08 macallan Exp $        */
+/*      $NetBSD: ukbd.c,v 1.113 2011/11/03 02:41:29 macallan Exp $        */
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * 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
 @@ -25,27 +25,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT 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.
  */
 /*
  * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.112 2011/11/02 08:49:08 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.113 2011/11/03 02:41:29 macallan Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/file.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/poll.h>
 @@ -56,26 +56,27 @@ __KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.1
 #include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 #include <dev/usb/usb_quirks.h>
 #include <dev/usb/uhidev.h>
 #include <dev/usb/hid.h>
 #include <dev/usb/ukbdvar.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wskbdvar.h>
 #include <dev/wscons/wsksymdef.h>
 #include <dev/wscons/wsksymvar.h>
 #ifdef _KERNEL_OPT
 #include "opt_ukbd.h"
 #include "opt_ukbd_layout.h"
 #include "opt_wsdisplay_compat.h"
 #include "opt_ddb.h"
 #endif /* _KERNEL_OPT */
 #ifdef UKBD_DEBUG
 #define DPRINTF(x)	if (ukbddebug) printf x
 #define DPRINTFN(n,x)	if (ukbddebug>(n)) printf x
 int	ukbddebug = 0;
 #else
 #define DPRINTF(x)
 #define DPRINTFN(n,x)
 #endif
 @@ -135,50 +136,52 @@ Static const struct ukbd_keycodetrans tr
 	{ 0x50, 0x4a },	/* Left -> Home */
 	{ 0x51, 0x4e },	/* Down -> PageDown */
 	{ 0x52, 0x4b },	/* Up -> PageUp */
 	{ 0x00, 0x00 }
 };
 Static const struct ukbd_keycodetrans trtab_apple_iso[] = {
 	{ 0x35, 0x64 },	/* swap the key above tab with key right of shift */
 	{ 0x64, 0x35 },
 	{ 0x31, 0x32 },	/* key left of return is Europe1, not "\|" */
 	{ 0x00, 0x00 }
 };
 #ifdef GDIUM_KEYBOARD_HACK
 Static const struct ukbd_keycodetrans trtab_gdium_fn[] = {
 #ifdef notyet
 		{ 58, 0 },	/* F1 -> toggle camera */
 		{ 59, 0 },	/* F2 -> toggle wireless */
 #endif
 		{ 60, IS_PMF | PMFE_AUDIO_VOLUME_TOGGLE },
 		{ 61, IS_PMF | PMFE_AUDIO_VOLUME_UP },
 		{ 62, IS_PMF | PMFE_AUDIO_VOLUME_DOWN },
 #ifdef notyet
 		{ 63, 0 },	/* F6 -> toggle ext. video */
 		{ 64, 0 },	/* F7 -> toggle mouse */
 #endif
 		{ 65, IS_PMF | PMFE_DISPLAY_BRIGHTNESS_UP },
 		{ 66, IS_PMF | PMFE_DISPLAY_BRIGHTNESS_DOWN },
 #ifdef notyet
 		{ 67, 0 },	/* F10 -> suspend */
 		{ 68, 0 },	/* F11 -> user1 */
 		{ 69, 0 },	/* F12 -> user2 */
 		{ 70, 0 },	/* print screen -> sysrq */
 #endif
 		{ 76, 71 },	/* delete -> scroll lock */
 		{ 81, 78 },	/* down -> page down */
 		{ 82, 75 }	/* up -> page up */
 };
 #endif
 #if defined(__NetBSD__) && defined(WSDISPLAY_COMPAT_RAWKBD)
 #define NN 0			/* no translation */
 /*
  * Translate USB keycodes to US keyboard XT scancodes.
  * Scancodes >= 0x80 represent EXTENDED keycodes.
+ *
  * See http://www.microsoft.com/whdc/archive/scancode.mspx
+ *
  * Note: a real pckbd(4) has more complexity in its
  * protocol for some keys than this translation implements.
  * For example, some keys generate Fake ShiftL events (e0 2a)
  * before the actual key sequence.
 @@ -413,29 +416,31 @@ ukbd_attach(device_t parent, device_t se
 	if (parseerr != NULL) {
 		aprint_normal("\n");
 		aprint_error_dev(self, "attach failed, %s\n", parseerr);
 		return;
+	}
 	/* Quirks */
 	qflags = usbd_get_quirks(uha->parent->sc_udev)->uq_flags;
 	if (qflags & UQ_SPUR_BUT_UP)
 		sc->sc_flags |= FLAG_DEBOUNCE;
 	if (qflags & UQ_APPLE_ISO)
 		sc->sc_flags |= FLAG_APPLE_FIX_ISO;
 #ifdef GDIUM_KEYBOARD_HACK
 	if (uha->uaa->vendor == USB_VENDOR_CYPRESS &&
 	    uha->uaa->product == USB_PRODUCT_CYPRESS_LPRDK)
 		sc->sc_flags = FLAG_GDIUM_FN;
 #endif
 #ifdef DIAGNOSTIC
 	aprint_normal(": %d modifier keys, %d key codes", sc->sc_nmod,
 	       sc->sc_nkeycode);
 	if (sc->sc_flags & FLAG_APPLE_FN)
 		aprint_normal(", apple fn key");
 	if (sc->sc_flags & FLAG_APPLE_FIX_ISO)
 		aprint_normal(", fix apple iso");
 	if (sc->sc_flags & FLAG_GDIUM_FN)
 		aprint_normal(", Gdium fn key");
 #endif
 	aprint_normal("\n");
 @@ -644,32 +649,34 @@ ukbd_intr(struct uhidev *addr, void *ibu
 		if (hid_get_data(ibuf, &sc->sc_modloc[i]))
 			ud->modifiers |= sc->sc_mods[i].mask;
 	memcpy(ud->keycode, (char *)ibuf + sc->sc_keycodeloc.pos / 8,
 	       sc->sc_nkeycode);
 	if (sc->sc_flags & FLAG_APPLE_FN) {
 		if (hid_get_data(ibuf, &sc->sc_apple_fn)) {
 			sc->sc_flags |= FLAG_FN_PRESSED;
 			ukbd_translate_keycodes(sc, ud, trtab_apple_fn);
+		}
 		else
 			sc->sc_flags &= ~FLAG_FN_PRESSED;
+	}
 #ifdef GDIUM_KEYBOARD_HACK
 	if (sc->sc_flags & FLAG_GDIUM_FN) {
 		if (sc->sc_flags & FLAG_FN_PRESSED) {
 			ukbd_translate_keycodes(sc, ud, trtab_gdium_fn);
+		}
+	}
 #endif
 	if ((sc->sc_flags & FLAG_DEBOUNCE) && !(sc->sc_flags & FLAG_POLLING)) {
 		/*
 		 * Some keyboards have a peculiar quirk.  They sometimes
 		 * generate a key up followed by a key down for the same
 		 * key after about 10 ms.
 		 * We avoid this bug by holding off decoding for 20 ms.
 		 */
 		sc->sc_data = *ud;
 		callout_reset(&sc->sc_delay, hz / 50, ukbd_delayed_decode, sc);
 #ifdef DDB
 	} else if (sc->sc_console_keyboard && !(sc->sc_flags & FLAG_POLLING)) {
 		/*
 @@ -748,52 +755,56 @@ ukbd_decode(struct ukbd_softc *sc, struc
 				    PRESS : RELEASE);
 				ADDKEY(ukbd_translate_modifier(sc, key));
+			}
 	if (memcmp(ud->keycode, sc->sc_odata.keycode, sc->sc_nkeycode) != 0) {
 		/* Check for released keys. */
 		for (i = 0; i < sc->sc_nkeycode; i++) {
 			key = sc->sc_odata.keycode[i];
 			if (key == 0)
 				continue;
 			for (j = 0; j < sc->sc_nkeycode; j++)
 				if (key == ud->keycode[j])
 					goto rfound;
 			DPRINTFN(3,("ukbd_intr: relse key=0x%02x\n", key));
 #ifdef GDIUM_KEYBOARD_HACK
 			if (sc->sc_flags & FLAG_GDIUM_FN) {
 				if (key == 0x82) {
 					sc->sc_flags &= ~FLAG_FN_PRESSED;
 					goto rfound;
+				}
+			}
 #endif
 			ADDKEY(key | RELEASE);
 		rfound:
+			;
+		}
 		/* Check for pressed keys. */
 		for (i = 0; i < sc->sc_nkeycode; i++) {
 			key = ud->keycode[i];
 			if (key == 0)
 				continue;
 			for (j = 0; j < sc->sc_nkeycode; j++)
 				if (key == sc->sc_odata.keycode[j])
 					goto pfound;
 			DPRINTFN(2,("ukbd_intr: press key=0x%02x\n", key));
 #ifdef GDIUM_KEYBOARD_HACK
 			if (sc->sc_flags & FLAG_GDIUM_FN) {
 				if (key == 0x82) {
 					sc->sc_flags |= FLAG_FN_PRESSED;
 					goto pfound;
+				}
+			}
 #endif
 			ADDKEY(key | PRESS);
 		pfound:
+			;
+		}
+	}
 	sc->sc_odata = *ud;
 	if (nkeys == 0)
 		return;
 	if (sc->sc_flags & FLAG_POLLING) {
 		DPRINTFN(1,("ukbd_intr: pollchar = 0x%03x\n", ibuf[0]));
 		memcpy(sc->sc_pollchars, ibuf, nkeys * sizeof(u_int16_t));

 @@ -1,14 +1,14 @@
-#	$NetBSD: files.usb,v 1.115 2011/10/02 16:30:58 jmcneill Exp $
+#	$NetBSD: files.usb,v 1.116 2011/11/03 02:41:29 macallan Exp $
+#
 # Config file and device description for machine-independent USB code.
 # Included by ports that need it.  Ports that use it must provide
 # their own "major" declarations for the appropriate devices.
 defflag	USBVERBOSE
 defflag	opt_usb.h	USB_FRAG_DMA_WORKAROUND
 defflag	opt_usb.h	EHCI_DEBUG OHCI_DEBUG UHCI_DEBUG UHUB_DEBUG USB_DEBUG
 defflag	opt_uvideo.h	UVIDEO_DEBUG
 defflag	opt_umass.h	UMASS_DEBUG
 define	usbroothubif { }
 @@ -69,26 +69,28 @@ define	uhidbus {[ reportid = -1 ]}
 # HID root device for multiple report IDs
 device	uhidev: hid, uhidbus
 attach	uhidev at usbifif
 file	dev/usb/uhidev.c		uhidev
 # Generic HID devices
 device	uhid: hid
 attach	uhid at uhidbus
 file	dev/usb/uhid.c			uhid			needs-flag
 # Keyboards
 defparam	UKBD_LAYOUT
 # Gdium's Fn key needs software translation
 defflag		opt_ukbd.h 	GDIUM_KEYBOARD_HACK
 device	ukbd: hid, wskbddev
 attach	ukbd at uhidbus
 file	dev/usb/ukbd.c			ukbd			needs-flag
 file	dev/usb/ukbdmap.c		ukbd | btkbd
 # Mice
 device	ums: hid, wsmousedev
 attach	ums at uhidbus
 file	dev/usb/ums.c			ums
 # eGalax USB Touch Panel
 device	uep: wsmousedev, tpcalib
 attach	uep at usbdevif