diff options
| author | Hans Petter Selasky <hselasky@FreeBSD.org> | 2013-08-20 16:21:05 +0000 |
|---|---|---|
| committer | Hans Petter Selasky <hselasky@FreeBSD.org> | 2013-08-20 16:21:05 +0000 |
| commit | 3a8f0c444ad01f09cc414e66fb2d158ed8b0848a (patch) | |
| tree | 2700b22725402442b5d99063389092084465d079 | |
| parent | a66b2c65c393d2e51593847237c14aa4cbda8421 (diff) | |
| download | src-3a8f0c444ad01f09cc414e66fb2d158ed8b0848a.tar.gz src-3a8f0c444ad01f09cc414e66fb2d158ed8b0848a.zip | |
Force keyboards which don't have the required
HID fields to use the USB BOOT protocol for now.
PR: usb/181425
Submitted by: Andrey Zholos <aaz@q-fu.com>
MFC after: 4 weeks
Notes
Notes:
svn path=/head/; revision=254572
| -rw-r--r-- | sys/dev/usb/input/ukbd.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/dev/usb/input/ukbd.c b/sys/dev/usb/input/ukbd.c index 770c8fc704a3..dd4b32956944 100644 --- a/sys/dev/usb/input/ukbd.c +++ b/sys/dev/usb/input/ukbd.c @@ -1130,8 +1130,12 @@ ukbd_parse_hid(struct ukbd_softc *sc, const uint8_t *ptr, uint32_t len) 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 */ |