mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-27 03:10:12 +00:00
Code Issues Releases Wiki Activity

HID: uclogic: Switch to matching subreport bytes

Browse source 
Switch from matching UC-Logic subreport with a mask to a full value to
support detecting Huion HS610 touch dial reports. Those would match the
button mask otherwise.

Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com>
Signed-off-by: José Expósito <jose.exposito89@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Nikolai Kondrashov 2022-02-19 11:01:51 +01:00 committed by Jiri Kosina
parent 8b013098be
commit e6be956fd7
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/hid/hid-uclogic-core.c
View file

@ -365,9 +365,12 @@ static int uclogic_raw_event(struct hid_device *hdev,
ARRAY_SIZE(params->pen.subreport_list);
/* Try to match a subreport */
for (subreport = params->pen.subreport_list;
subreport < subreport_list_end &&
(data[1] & subreport->mask) != subreport->mask;
subreport++);
subreport < subreport_list_end; subreport++) {
if (subreport->value != 0 &&
subreport->value == data[1]) {
break;
}
}
/* If a subreport matched */
if (subreport < subreport_list_end) {
/* Change to subreport ID, and restart */

4
drivers/hid/hid-uclogic-params.c
View file

@ -763,7 +763,7 @@ static int uclogic_params_huion_init(struct uclogic_params *params,
goto cleanup;
}
/* Link frame button subreports from pen reports */
p.pen.subreport_list[0].mask = 0x20;
p.pen.subreport_list[0].value = 0xe0;
p.pen.subreport_list[0].id =
UCLOGIC_RDESC_BUTTONPAD_V2_ID;
goto output;
@ -791,7 +791,7 @@ static int uclogic_params_huion_init(struct uclogic_params *params,
(found ? "" : " not"));
if (found) {
/* Link frame button subreports from pen reports */
p.pen.subreport_list[0].mask = 0x20;
p.pen.subreport_list[0].value = 0xe0;
p.pen.subreport_list[0].id =
UCLOGIC_RDESC_BUTTONPAD_V1_ID;
}

13
drivers/hid/hid-uclogic-params.h
View file

@ -39,14 +39,15 @@ extern const char *uclogic_params_pen_inrange_to_str(
*/
struct uclogic_params_pen_subreport {
/*
* The subreport's bitmask matching the second byte of the pen report.
* If zero, the subreport is considered invalid, and won't match.
* The value of the second byte of the pen report indicating this
* subreport. If zero, the subreport should be considered invalid and
* not matched.
*/
__u8 mask;
__u8 value;
/*
* The ID to be assigned to the report, if the "mask" matches.
* Only valid if "mask" is not zero.
* The ID to be assigned to the report, if the second byte of the pen
* report is equal to "value". Only valid if "value" is not zero.
*/
__u8 id;
};
@ -200,7 +201,7 @@ extern int uclogic_params_init(struct uclogic_params *params,
(_params)->pen.desc_ptr, \
(_params)->pen.desc_size, \
(_params)->pen.id, \
(_params)->pen.subreport_list[0].mask, \
(_params)->pen.subreport_list[0].value, \
(_params)->pen.subreport_list[0].id, \
uclogic_params_pen_inrange_to_str((_params)->pen.inrange), \
((_params)->pen.fragmented_hires ? "true" : "false"), \