hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-26 10:53:39 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

hmt(4): Do not require input report HID usages to be a member of TLC

Browse Source 
Some touchpads places button usages (in HID report descriptor) in to
the 2-nd level collection rather than in to the top level one. That
confuses current code. Remove collection level check in HID report
descriptor parser to fix device detection.

Reported by:	Peter Much <pmc@citylink.dinoex.sub.org>
PR:		267094
MFC after:	1 week
This commit is contained in:
Vladimir Kondratyev 2023-11-02 09:20:20 +03:00
parent 87a53bef41
commit 1d46c8e5c2
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/hid/hmt.c
View File

@ -744,14 +744,13 @@ hmt_hid_parse(struct hmt_softc *sc, const void *d_ptr, hid_size_t d_len,
else
break;
if (hi.collevel == 1 && left_btn == 2 &&
if (left_btn == 2 &&
hi.usage == HID_USAGE2(HUP_BUTTON, 1)) {
has_int_button = true;
sc->int_btn_loc = hi.loc;
break;
}
if (hi.collevel == 1 &&
hi.usage >= HID_USAGE2(HUP_BUTTON, left_btn) &&
if (hi.usage >= HID_USAGE2(HUP_BUTTON, left_btn) &&
hi.usage <= HID_USAGE2(HUP_BUTTON, HMT_BTN_MAX)) {
btn = (hi.usage & 0xFFFF) - left_btn;
setbit(sc->buttons, btn);
@ -760,13 +759,13 @@ hmt_hid_parse(struct hmt_softc *sc, const void *d_ptr, hid_size_t d_len,
sc->max_button = btn + 1;
break;
}
if (hi.collevel == 1 && hi.usage ==
if (hi.usage ==
HID_USAGE2(HUP_DIGITIZERS, HUD_CONTACTCOUNT)) {
cont_count_found = true;
sc->cont_count_loc = hi.loc;
break;
}
if (hi.collevel == 1 && hi.usage ==
if (hi.usage ==
HID_USAGE2(HUP_DIGITIZERS, HUD_SCAN_TIME)) {
scan_time_found = true;
sc->scan_time_loc = hi.loc;