DIGImend patches, part III
cover DIGImend patches, part III
Hi everyone,
This series is a follow up to [1] and [2], kindly reviewed and applied by Jiří in hid.git#for-5.18/uclogic.
It adds support for touch rings in order handle the Huion HS610 tablet.
Thank you very much to Nikolai for the patches a to the maintaners for the quick reviews,
José Expósito
[1] https://lore.kernel.org/linux-input/[email protected]/T/
[2] https://lore.kernel.org/linux-input/[email protected]/T/
Nikolai Kondrashov (4):
HID: uclogic: Add support for touch ring reports
HID: uclogic: Support custom device suffix for frames
HID: uclogic: Allow three frame parameter sets
HID: uclogic: Add support for Huion touch ring reports
drivers/hid/hid-uclogic-core.c | 83 +++++++++++++++++++++-------- drivers/hid/hid-uclogic-params.c | 40 +++++++++++--- drivers/hid/hid-uclogic-params.h | 90 +++++++++++++++++++++++++++++--- drivers/hid/hid-uclogic-rdesc.c | 65 ++++++++++++++++++++--- drivers/hid/hid-uclogic-rdesc.h | 20 +++++-- 5 files changed, 250 insertions(+), 48 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/4 HID: uclogic: Add support for touch ring reports
From: Nikolai Kondrashov <[email protected]>
Add support for touch ring to UC-Logic driver. The touch ring reports can be flipped around a specific point to match the orientation and direction reported by the Wacom drivers. The proximity will also be reported similar to the Wacom drivers.
--- drivers/hid/hid-uclogic-core.c | 39 +++++++++++++++++++++++++++++++- drivers/hid/hid-uclogic-params.h | 36 +++++++++++++++++++++++++---- 2 files changed, 70 insertions(+), 5 deletions(-)
drivers/hid/hid-uclogic-core.c +38 -1
@@ -90,6 +90,8 @@ static int uclogic_input_configured(struct hid_device *hdev,const char *suffix =NULL ;struct hid_field *field;size_t len; +size_t i; +const struct uclogic_params_frame *frame;/* no report associated (HID_QUIRK_MULTI_INPUT not set) */ if (!hi->report)
@@ -104,6 +106,19 @@ static int uclogic_input_configured(struct hid_device *hdev, drvdata->pen_input = hi->input; } +/* If it's one of the frame devices */ +for (i =0 ; i <ARRAY_SIZE (params->frame_list); i++) { + frame = ¶ms->frame_list[i]; +if (hi->report->id == frame->id) { +/* +* Disable EV_MSC reports for touch ring interfaces to +* make the Wacom driver pickup touch ring extents +*/ +if (frame->touch_ring_byte >0 ) +__clear_bit (EV_MSC , hi->input->evbit); + } + } + field = hi->report->field[0 ];switch (field->application) {
@@ -313,8 +328,16 @@ static int uclogic_raw_event_frame(/* If need to, and can, set pad device ID for Wacom drivers */ if (frame->dev_id_byte >0 && frame->dev_id_byte < size) { - data[frame->dev_id_byte] =0xf ; +/* If we also have a touch ring and the finger left it */ +if (frame->touch_ring_byte >0 && + frame->touch_ring_byte < size && + data[frame->touch_ring_byte] ==0 ) { + data[frame->dev_id_byte] =0 ; + }else { + data[frame->dev_id_byte] =0xf ; + } } +/* If need to, and can, read rotary encoder state change */ if (frame->re_lsb >0 && frame->re_lsb /8 < size) {unsigned int byte = frame->re_lsb /8 ;
@@ -341,6 +364,20 @@ static int uclogic_raw_event_frame( drvdata->re_state = state; } +/* If need to, and can, transform the touch ring reports */ +if (frame->touch_ring_byte >0 && frame->touch_ring_byte < size && + frame->touch_ring_flip_at !=0 ) { +__s8 value = data[frame->touch_ring_byte]; + +if (value !=0 ) { + value = frame->touch_ring_flip_at - value; +if (value <0 ) + value = frame->touch_ring_max + value; + + data[frame->touch_ring_byte] = value; + } + } +return 0 ; }
drivers/hid/hid-uclogic-params.h +32 -4
@@ -123,10 +123,32 @@ struct uclogic_params_frame {/* * Offset of the Wacom-style device ID byte in the report, to be set * to pad device ID (0xf), for compatibility with Wacom drivers. Zero -* if no changes to the report should be made. Only valid if "id" is -* not zero. +* if no changes to the report should be made. The ID byte will be set +* to zero whenever the byte pointed by "touch_ring_byte" is zero, if +* the latter is valid. Only valid if "id" is not zero. */ unsigned int dev_id_byte; +/* +* Offset of the touch ring state byte, in the report. +* Zero if not present. If dev_id_byte is also valid and non-zero, +* then the device ID byte will be cleared when the byte pointed to by +* this offset is zero. Only valid if "id" is not zero. +*/ +unsigned int touch_ring_byte; + +/* +* Maximum value of the touch ring report. +* The minimum valid value is considered to be one, +* with zero being out-of-proximity (finger lift) value. +*/ +__s8 touch_ring_max; + +/* +* The value to anchor the reversed reports at. +* I.e. one, if the reports should be flipped without offset. +* Zero if no reversal should be done. +*/ +__s8 touch_ring_flip_at; };/*
@@ -191,7 +213,10 @@ extern int uclogic_params_init(struct uclogic_params *params,".frame_list[0].desc_size = %u\n" \".frame_list[0].id = %u\n" \".frame_list[0].re_lsb = %u\n" \ -".frame_list[0].dev_id_byte = %u\n" +".frame_list[0].dev_id_byte = %u\n" \ +".frame_list[0].touch_ring_byte = %u\n" \ +".frame_list[0].touch_ring_max = %hhd\n" \ +".frame_list[0].touch_ring_flip_at = %hhd\n" /* Tablet interface parameters *printf format arguments */ #define UCLOGIC_PARAMS_FMT_ARGS(_params) \
@@ -210,7 +235,10 @@ extern int uclogic_params_init(struct uclogic_params *params, (_params)->frame_list[0 ].desc_size, \ (_params)->frame_list[0 ].id, \ (_params)->frame_list[0 ].re_lsb, \ - (_params)->frame_list[0 ].dev_id_byte + (_params)->frame_list[0 ].dev_id_byte, \ + (_params)->frame_list[0 ].touch_ring_byte, \ + (_params)->frame_list[0 ].touch_ring_max, \ + (_params)->frame_list[0 ].touch_ring_flip_at /* Get a replacement report descriptor for a tablet's interface. */ extern int uclogic_params_get_desc(const struct uclogic_params *params,
Signature · 1 line
2.25.1
PATCH 2/4 HID: uclogic: Support custom device suffix for frames
In reply to José ExpósitoFrom: Nikolai Kondrashov <[email protected]>
Support assigning custom device name suffixes to frame input devices instead of just "Pad". This allows distinguishing multiple frame input devices, e.g. for Huion HS610.
--- drivers/hid/hid-uclogic-core.c | 46 +++++++++++++++++--------------- drivers/hid/hid-uclogic-params.h | 6 +++++ 2 files changed, 31 insertions(+), 21 deletions(-)
drivers/hid/hid-uclogic-core.c +25 -21
@@ -110,6 +110,8 @@ static int uclogic_input_configured(struct hid_device *hdev,for (i =0 ; i <ARRAY_SIZE (params->frame_list); i++) { frame = ¶ms->frame_list[i];if (hi->report->id == frame->id) { +/* Assign custom suffix, if any */ + suffix = frame->suffix;/* * Disable EV_MSC reports for touch ring interfaces to * make the Wacom driver pickup touch ring extents
@@ -119,27 +121,29 @@ static int uclogic_input_configured(struct hid_device *hdev, } } - field = hi->report->field[0 ]; - -switch (field->application) { -case HID_GD_KEYBOARD : - suffix ="Keyboard" ; -break ; -case HID_GD_MOUSE : - suffix ="Mouse" ; -break ; -case HID_GD_KEYPAD : - suffix ="Pad" ; -break ; -case HID_DG_PEN : - suffix ="Pen" ; -break ; -case HID_CP_CONSUMER_CONTROL : - suffix ="Consumer Control" ; -break ; -case HID_GD_SYSTEM_CONTROL : - suffix ="System Control" ; -break ; +if (!suffix) { + field = hi->report->field[0 ]; + +switch (field->application) { +case HID_GD_KEYBOARD : + suffix ="Keyboard" ; +break ; +case HID_GD_MOUSE : + suffix ="Mouse" ; +break ; +case HID_GD_KEYPAD : + suffix ="Pad" ; +break ; +case HID_DG_PEN : + suffix ="Pen" ; +break ; +case HID_CP_CONSUMER_CONTROL : + suffix ="Consumer Control" ; +break ; +case HID_GD_SYSTEM_CONTROL : + suffix ="System Control" ; +break ; + } }if (suffix) {
drivers/hid/hid-uclogic-params.h +6 -0
@@ -114,6 +114,10 @@ struct uclogic_params_frame {* Report ID, if reports should be tweaked, zero if not. */ unsigned int id; +/* +* The suffix to add to the input device name, if not NULL. +*/ +const char *suffix;/* * Number of the least-significant bit of the 2-bit state of a rotary * encoder, in the report. Cannot point to a 2-bit field crossing a
@@ -212,6 +216,7 @@ extern int uclogic_params_init(struct uclogic_params *params,".frame_list[0].desc_ptr = %p\n" \".frame_list[0].desc_size = %u\n" \".frame_list[0].id = %u\n" \ +".frame_list[0].suffix = %s\n" \".frame_list[0].re_lsb = %u\n" \".frame_list[0].dev_id_byte = %u\n" \".frame_list[0].touch_ring_byte = %u\n" \
@@ -234,6 +239,7 @@ extern int uclogic_params_init(struct uclogic_params *params, (_params)->frame_list[0 ].desc_ptr, \ (_params)->frame_list[0 ].desc_size, \ (_params)->frame_list[0 ].id, \ + (_params)->frame_list[0 ].suffix, \ (_params)->frame_list[0 ].re_lsb, \ (_params)->frame_list[0 ].dev_id_byte, \ (_params)->frame_list[0].touch_ring_byte, \
Signature · 1 line
2.25.1
PATCH 3/4 HID: uclogic: Allow three frame parameter sets
In reply to José ExpósitoFrom: Nikolai Kondrashov <[email protected]>
Allow three frame parameter sets per each UC-Logic tablet interface. Bump the number of supported subreports to three as well to accommodate ID routing. This allows supporting the dial on Huion Q620M.
--- drivers/hid/hid-uclogic-params.h | 52 +++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 5 deletions(-)
drivers/hid/hid-uclogic-params.h +47 -5
@@ -73,8 +73,8 @@ struct uclogic_params_pen {unsigned int desc_size;/* Report ID, if reports should be tweaked, zero if not */ unsigned int id; -/* The list of subreports */ -struct uclogic_params_pen_subreport subreport_list[1 ]; +/* The list of subreports, only valid if "id" is not zero */ +struct uclogic_params_pen_subreport subreport_list[3 ];/* Type of in-range reporting, only valid if "id" is not zero */ enum uclogic_params_pen_inrange inrange;/*
@@ -194,7 +194,7 @@ struct uclogic_params {* The list of frame control parameters and optional report descriptor * parts. Only valid, if "invalid" is false. */ -struct uclogic_params_frame frame_list[1 ]; +struct uclogic_params_frame frame_list[3 ]; };/* Initialize a tablet interface and discover its parameters */
@@ -210,6 +210,8 @@ extern int uclogic_params_init(struct uclogic_params *params,".pen.desc_size = %u\n" \".pen.id = %u\n" \".pen.subreport_list[0] = {0x%02hhx, %hhu}\n" \ +".pen.subreport_list[1] = {0x%02hhx, %hhu}\n" \ +".pen.subreport_list[2] = {0x%02hhx, %hhu}\n" \".pen.inrange = %s\n" \".pen.fragmented_hires = %s\n" \".pen.tilt_y_flipped = %s\n" \
@@ -221,7 +223,25 @@ extern int uclogic_params_init(struct uclogic_params *params,".frame_list[0].dev_id_byte = %u\n" \".frame_list[0].touch_ring_byte = %u\n" \".frame_list[0].touch_ring_max = %hhd\n" \ -".frame_list[0].touch_ring_flip_at = %hhd\n" +".frame_list[0].touch_ring_flip_at = %hhd\n" \ +".frame_list[1].desc_ptr = %p\n" \ +".frame_list[1].desc_size = %u\n" \ +".frame_list[1].id = %u\n" \ +".frame_list[1].suffix = %s\n" \ +".frame_list[1].re_lsb = %u\n" \ +".frame_list[1].dev_id_byte = %u\n" \ +".frame_list[1].touch_ring_byte = %u\n" \ +".frame_list[1].touch_ring_max = %hhd\n" \ +".frame_list[1].touch_ring_flip_at = %hhd\n" \ +".frame_list[2].desc_ptr = %p\n" \ +".frame_list[2].desc_size = %u\n" \ +".frame_list[2].id = %u\n" \ +".frame_list[2].suffix = %s\n" \ +".frame_list[2].re_lsb = %u\n" \ +".frame_list[2].dev_id_byte = %u\n" \ +".frame_list[2].touch_ring_byte = %u\n" \ +".frame_list[2].touch_ring_max = %hhd\n" \ +".frame_list[2].touch_ring_flip_at = %hhd\n" /* Tablet interface parameters *printf format arguments */ #define UCLOGIC_PARAMS_FMT_ARGS(_params) \
@@ -233,6 +253,10 @@ extern int uclogic_params_init(struct uclogic_params *params, (_params)->pen.id, \ (_params)->pen.subreport_list[0 ].value, \ (_params)->pen.subreport_list[0 ].id, \ + (_params)->pen.subreport_list[1 ].value, \ + (_params)->pen.subreport_list[1 ].id, \ + (_params)->pen.subreport_list[2 ].value, \ + (_params)->pen.subreport_list[2 ].id, \uclogic_params_pen_inrange_to_str ((_params)->pen.inrange), \ ((_params)->pen.fragmented_hires ?"true" :"false" ), \ ((_params)->pen.tilt_y_flipped ? "true" : "false"), \
@@ -244,7 +268,25 @@ extern int uclogic_params_init(struct uclogic_params *params, (_params)->frame_list[0 ].dev_id_byte, \ (_params)->frame_list[0 ].touch_ring_byte, \ (_params)->frame_list[0 ].touch_ring_max, \ - (_params)->frame_list[0 ].touch_ring_flip_at + (_params)->frame_list[0 ].touch_ring_flip_at, \ + (_params)->frame_list[1 ].desc_ptr, \ + (_params)->frame_list[1 ].desc_size, \ + (_params)->frame_list[1 ].id, \ + (_params)->frame_list[1 ].suffix, \ + (_params)->frame_list[1 ].re_lsb, \ + (_params)->frame_list[1 ].dev_id_byte, \ + (_params)->frame_list[1 ].touch_ring_byte, \ + (_params)->frame_list[1 ].touch_ring_max, \ + (_params)->frame_list[1 ].touch_ring_flip_at, \ + (_params)->frame_list[2 ].desc_ptr, \ + (_params)->frame_list[2 ].desc_size, \ + (_params)->frame_list[2 ].id, \ + (_params)->frame_list[2 ].suffix, \ + (_params)->frame_list[2 ].re_lsb, \ + (_params)->frame_list[2 ].dev_id_byte, \ + (_params)->frame_list[2 ].touch_ring_byte, \ + (_params)->frame_list[2 ].touch_ring_max, \ + (_params)->frame_list[2].touch_ring_flip_at /* Get a replacement report descriptor for a tablet's interface. */ extern int uclogic_params_get_desc(const struct uclogic_params *params,
Signature · 1 line
2.25.1
PATCH 4/4 HID: uclogic: Add support for Huion touch ring reports
In reply to José ExpósitoFrom: Nikolai Kondrashov <[email protected]>
Support touch ring reports found in Huion HS610 to the UC-Logic driver.
--- drivers/hid/hid-uclogic-params.c | 40 ++++++++++++++++---- drivers/hid/hid-uclogic-rdesc.c | 65 ++++++++++++++++++++++++++++---- drivers/hid/hid-uclogic-rdesc.h | 20 +++++++--- 3 files changed, 105 insertions(+), 20 deletions(-)
drivers/hid/hid-uclogic-params.c +33 -7
@@ -745,22 +745,48 @@ static int uclogic_params_huion_init(struct uclogic_params *params, goto cleanup; }else if (found) {hid_dbg (hdev,"pen v2 parameters found\n" ); -/* Create v2 frame parameters */ +/* Create v2 frame button parameters */ rc =uclogic_params_frame_init_with_desc ( &p.frame_list[0 ], - uclogic_rdesc_v2_frame_arr, - uclogic_rdesc_v2_frame_size, -UCLOGIC_RDESC_V2_FRAME_ID ); + uclogic_rdesc_v2_frame_buttons_arr, + uclogic_rdesc_v2_frame_buttons_size, +UCLOGIC_RDESC_V2_FRAME_BUTTONS_ID );if (rc !=0 ) {hid_err (hdev, -"failed creating v2 frame parameters: %d\n" , +"failed creating v2 frame button parameters: %d\n" , rc); goto cleanup; } -/* Link frame button subreports from pen reports */ + +/* Create v2 frame touch ring parameters */ + rc =uclogic_params_frame_init_with_desc ( + &p.frame_list[1 ], + uclogic_rdesc_v2_frame_touch_ring_arr, + uclogic_rdesc_v2_frame_touch_ring_size, +UCLOGIC_RDESC_V2_FRAME_TOUCH_RING_ID ); +if (rc !=0 ) { +hid_err (hdev, +"failed creating v2 frame touch ring parameters: %d\n" , + rc); + goto cleanup; + } + p.frame_list[1 ].suffix ="Touch Ring" ; + p.frame_list[1 ].dev_id_byte = +UCLOGIC_RDESC_V2_FRAME_TOUCH_RING_DEV_ID_BYTE ; + p.frame_list[1 ].touch_ring_byte =5 ; + p.frame_list[1 ].touch_ring_max =12 ; + p.frame_list[1 ].touch_ring_flip_at =6 ; + +/* +* Link button and touch ring subreports from pen +* reports +*/ p.pen.subreport_list[0 ].value =0xe0 ; p.pen.subreport_list[0 ].id = -UCLOGIC_RDESC_V2_FRAME_ID ; +UCLOGIC_RDESC_V2_FRAME_BUTTONS_ID ; + p.pen.subreport_list[1 ].value =0xf0 ; + p.pen.subreport_list[1 ].id = +UCLOGIC_RDESC_V2_FRAME_TOUCH_RING_ID ; goto output; }hid_dbg (hdev,"pen v2 parameters not found\n" );
drivers/hid/hid-uclogic-rdesc.c +57 -8
86 lines not on this page · raw message
drivers/hid/hid-uclogic-rdesc.h +15 -5
@@ -124,12 +124,22 @@ extern const size_t uclogic_rdesc_v2_pen_template_size;extern const __u8 uclogic_rdesc_v1_frame_arr[];extern const size_t uclogic_rdesc_v1_frame_size; -/* Report ID for tweaked v2 frame reports */ -#define UCLOGIC_RDESC_V2_FRAME_ID 0xf7 +/* Report ID for tweaked v2 frame button reports */ +#define UCLOGIC_RDESC_V2_FRAME_BUTTONS_ID 0xf7 -/* Fixed report descriptor for (tweaked) v2 frame reports */ -extern const __u8 uclogic_rdesc_v2_frame_arr[]; -extern const size_t uclogic_rdesc_v2_frame_size; +/* Fixed report descriptor for (tweaked) v2 frame button reports */ +extern const __u8 uclogic_rdesc_v2_frame_buttons_arr[]; +extern const size_t uclogic_rdesc_v2_frame_buttons_size; + +/* Report ID for tweaked v2 frame touch ring reports */ +#define UCLOGIC_RDESC_V2_FRAME_TOUCH_RING_ID 0xf8 + +/* Fixed report descriptor for (tweaked) v2 frame touch ring reports */ +extern const __u8 uclogic_rdesc_v2_frame_touch_ring_arr[]; +extern const size_t uclogic_rdesc_v2_frame_touch_ring_size; + +/* Device ID byte offset in v2 frame touch ring reports */ +#define UCLOGIC_RDESC_V2_FRAME_TOUCH_RING_DEV_ID_BYTE 0x4/* Fixed report descriptor for Ugee EX07 frame */ extern const __u8 uclogic_rdesc_ugee_ex07_frame_arr[];
Signature · 1 line
2.25.1
Jiri Kosina
maintainerQuoted 20 lines · José Expósito
Hi everyone,
This series is a follow up to [1] and [2], kindly reviewed and applied by Jiří in hid.git#for-5.18/uclogic.
It adds support for touch rings in order handle the Huion HS610 tablet.
Thank you very much to Nikolai for the patches a to the maintaners for the quick reviews,
José Expósito[1] https://lore.kernel.org/linux-input/[email protected]/T/
[2] https://lore.kernel.org/linux-input/[email protected]/T/Nikolai Kondrashov (4):
HID: uclogic: Add support for touch ring reports
HID: uclogic: Support custom device suffix for frames
HID: uclogic: Allow three frame parameter sets
HID: uclogic: Add support for Huion touch ring reports
Quoted 6 lines
drivers/hid/hid-uclogic-core.c | 83 +++++++++++++++++++++-------- drivers/hid/hid-uclogic-params.c | 40 +++++++++++--- drivers/hid/hid-uclogic-params.h | 90 +++++++++++++++++++++++++++++--- drivers/hid/hid-uclogic-rdesc.c | 65 ++++++++++++++++++++--- drivers/hid/hid-uclogic-rdesc.h | 20 +++++-- 5 files changed, 250 insertions(+), 48 deletions(-)
Now in hid.git#for-5.19/uclogic. Thanks,
Signature · 2 lines
Jiri Kosina SUSE Labs