Author: hselasky
Date: Tue Sep 17 12:53:09 2013
New Revision: 255631
URL: http://svnweb.freebsd.org/changeset/base/255631

Log:
  MFC r254572:
  Force keyboards which don't have the required
  HID fields to use the USB BOOT protocol for now.
  
  PR:           usb/181425

Modified:
  stable/9/sys/dev/usb/input/ukbd.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/usb/input/ukbd.c
==============================================================================
--- stable/9/sys/dev/usb/input/ukbd.c   Tue Sep 17 12:50:57 2013        
(r255630)
+++ stable/9/sys/dev/usb/input/ukbd.c   Tue Sep 17 12:53:09 2013        
(r255631)
@@ -1126,8 +1126,12 @@ ukbd_parse_hid(struct ukbd_softc *sc, co
            HID_USAGE2(HUP_KEYBOARD, 0x00),
            hid_input, 0, &sc->sc_loc_events, &flags,
            &sc->sc_id_events)) {
-               sc->sc_flags |= UKBD_FLAG_EVENTS;
-               DPRINTFN(1, "Found keyboard events\n");
+               if (flags & HIO_VARIABLE) {
+                       DPRINTFN(1, "Ignoring keyboard event control\n");
+               } else {
+                       sc->sc_flags |= UKBD_FLAG_EVENTS;
+                       DPRINTFN(1, "Found keyboard event array\n");
+               }
        }
 
        /* figure out leds on keyboard */
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to