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

hkbd(4): Reduce diff with ukbd(4)

Browse Source 
MFC after:	2 weeks
This commit is contained in:
Vladimir Kondratyev 2021-09-10 00:39:05 +03:00
parent bedf31ad7e
commit 3ef9023f93
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/dev/hid/hkbd.c
View File

@ -657,7 +657,6 @@ hkbd_intr_callback(void *context, void *data, hid_size_t len)
uint32_t i;
uint8_t id = 0;
uint8_t modifiers;
int offset;
HKBD_LOCK_ASSERT(sc);
@ -709,13 +708,15 @@ hkbd_intr_callback(void *context, void *data, hid_size_t len)
} else if (id != sc->sc_id_loc_key[i]) {
continue; /* invalid HID ID */
} else if (i == 0) {
offset = sc->sc_loc_key[0].count;
if (offset < 0 || offset > len)
offset = len;
while (offset--) {
struct hid_location tmp_loc = sc->sc_loc_key[0];
/* range check array size */
if (tmp_loc.count > HKBD_NKEYCODE)
tmp_loc.count = HKBD_NKEYCODE;
while (tmp_loc.count--) {
uint32_t key =
hid_get_data(buf + offset, len - offset,
&sc->sc_loc_key[i]);
hid_get_udata(buf, len, &tmp_loc);
/* advance to next location */
tmp_loc.pos += tmp_loc.size;
if (key == KEY_ERROR) {
DPRINTF("KEY_ERROR\n");
sc->sc_ndata = sc->sc_odata;