Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-16 09:56:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HID: uclogic: Support fragmented high-res reports

Browse Source 
Support parsing fragmented high-resolution reports in hid-uclogic to
support v2 reporting protocol.

Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
This commit is contained in:
Nikolai Kondrashov 2019-02-10 12:13:55 +02:00 committed by Benjamin Tissoires
parent 01309e29eb
commit 59f2e0fca8
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/hid/hid-uclogic-core.c
View File

@ -265,6 +265,31 @@ static int uclogic_raw_event(struct hid_device *hdev,
/* Invert the in-range bit */ /* Invert the in-range bit */
data[1] ^= 0x40; data[1] ^= 0x40;
} }
/*
* If report contains fragmented high-resolution pen
* coordinates
*/
if (size >= 10 && params->pen.fragmented_hires) {
u8 pressure_low_byte;
u8 pressure_high_byte;
/* Lift pressure bytes */
pressure_low_byte = data[6];
pressure_high_byte = data[7];
/*
* Move Y coord to make space for high-order X
* coord byte
*/
data[6] = data[5];
data[5] = data[4];
/* Move high-order X coord byte */
data[4] = data[8];
/* Move high-order Y coord byte */
data[7] = data[9];
/* Place pressure bytes */
data[8] = pressure_low_byte;
data[9] = pressure_high_byte;
}
/* If we need to emulate in-range detection */ /* If we need to emulate in-range detection */
if (params->pen.inrange == UCLOGIC_PARAMS_PEN_INRANGE_NONE) { if (params->pen.inrange == UCLOGIC_PARAMS_PEN_INRANGE_NONE) {
/* Set in-range bit */ /* Set in-range bit */

8
drivers/hid/hid-uclogic-params.h
View File

@ -56,6 +56,12 @@ struct uclogic_params_pen {
unsigned int id; unsigned int id;
/* Type of in-range reporting, only valid if "id" is not zero */ /* Type of in-range reporting, only valid if "id" is not zero */
enum uclogic_params_pen_inrange inrange; enum uclogic_params_pen_inrange inrange;
/*
* True, if reports include fragmented high resolution coords, with
* high-order X and then Y bytes following the pressure field.
* Only valid if "id" is not zero.
*/
bool fragmented_hires;
}; };
/* /*
@ -151,6 +157,7 @@ extern int uclogic_params_init(struct uclogic_params *params,
".pen.desc_size = %u\n" \ ".pen.desc_size = %u\n" \
".pen.id = %u\n" \ ".pen.id = %u\n" \
".pen.inrange = %s\n" \ ".pen.inrange = %s\n" \
".pen.fragmented_hires = %s\n" \
".frame.desc_ptr = %p\n" \ ".frame.desc_ptr = %p\n" \
".frame.desc_size = %u\n" \ ".frame.desc_size = %u\n" \
".frame.id = %u\n" \ ".frame.id = %u\n" \
@ -166,6 +173,7 @@ extern int uclogic_params_init(struct uclogic_params *params,
(_params)->pen.desc_size, \ (_params)->pen.desc_size, \
(_params)->pen.id, \ (_params)->pen.id, \
uclogic_params_pen_inrange_to_str((_params)->pen.inrange), \ uclogic_params_pen_inrange_to_str((_params)->pen.inrange), \
((_params)->pen.fragmented_hires ? "true" : "false"), \
(_params)->frame.desc_ptr, \ (_params)->frame.desc_ptr, \
(_params)->frame.desc_size, \ (_params)->frame.desc_size, \
(_params)->frame.id, \ (_params)->frame.id, \