d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Evaluate modifier keys before the regular keys, so that if a modifier

Browse Source 
key is pressed at the same time as a regular key, that means key with
modifier is output. Some automated USB keyboards like Yubikeys need this.

This fixes a regression issue after r357861.

Reported by:	Adam McDougall <mcdouga9@egr.msu.edu>
PR:		224592
PR:		233884
MFC after:	3 days
Sponsored by:	Mellanox Technologies
This commit is contained in:
hselasky 2020-03-30 15:29:39 +00:00
parent 011cb14c5d
commit 376cca941f
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/dev/usb/input/ukbd.c
View File

@ -499,6 +499,21 @@ ukbd_interrupt(struct ukbd_softc *sc)
UKBD_LOCK_ASSERT();
/* Check for modifier key changes first */
for (key = 0xe0; key != 0xe8; key++) {
const uint64_t mask = 1ULL << (key % 64);
const uint64_t delta =
sc->sc_odata.bitmap[key / 64] ^
sc->sc_ndata.bitmap[key / 64];
if (delta & mask) {
if (sc->sc_odata.bitmap[key / 64] & mask)
ukbd_put_key(sc, key | KEY_RELEASE);
else
ukbd_put_key(sc, key | KEY_PRESS);
}
}
/* Check for key changes */
for (key = 0; key != UKBD_NKEYCODE; key++) {
const uint64_t mask = 1ULL << (key % 64);
@ -509,6 +524,8 @@ ukbd_interrupt(struct ukbd_softc *sc)
if (mask == 1 && delta == 0) {
key += 63;
continue; /* skip empty areas */
} else if (ukbd_is_modifier_key(key)) {
continue;
} else if (delta & mask) {
if (sc->sc_odata.bitmap[key / 64] & mask) {
ukbd_put_key(sc, key | KEY_RELEASE);
@ -519,9 +536,6 @@ ukbd_interrupt(struct ukbd_softc *sc)
} else {
ukbd_put_key(sc, key | KEY_PRESS);
if (ukbd_is_modifier_key(key))
continue;
sc->sc_co_basetime = sbinuptime();
sc->sc_delay = sc->sc_kbd.kb_delay1;
ukbd_start_timer(sc);