Commit c3e6e59a authored by Nikolai Kondrashov's avatar Nikolai Kondrashov Committed by Jiri Kosina
Browse files

HID: uclogic: Add support for Huion touch ring reports 



Support touch ring reports found in Huion HS610 to the UC-Logic driver.

Signed-off-by: default avatarNikolai Kondrashov <spbnick@gmail.com>
Signed-off-by: default avatarJosé Expósito <jose.exposito89@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 3e200d6c

drivers/hid/hid-uclogic-params.c

+33 −7
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -652,12 +652,12 @@ const size_t uclogic_rdesc_v2_pen_template_size = 
			sizeof(uclogic_rdesc_v2_pen_template_arr);



/*

 * Expand to the contents of a generic frame report descriptor.

 * Expand to the contents of a generic frame buttons report descriptor.

 *

 * @_id:	The report ID to use.

 * @_size:	Size of the report to pad to, including report ID, bytes.

 */

#define UCLOGIC_RDESC_FRAME_BYTES(_id, _size) \

#define UCLOGIC_RDESC_FRAME_BUTTONS_BYTES(_id, _size) \

	0x05, 0x01,     /*  Usage Page (Desktop),               */ \

	0x09, 0x07,     /*  Usage (Keypad),                     */ \

	0xA1, 0x01,     /*  Collection (Application),           */ \
@@ -700,17 +700,66 @@ const size_t uclogic_rdesc_v2_pen_template_size = 


/* Fixed report descriptor for (tweaked) v1 frame reports */

const __u8 uclogic_rdesc_v1_frame_arr[] = {

	UCLOGIC_RDESC_FRAME_BYTES(UCLOGIC_RDESC_V1_FRAME_ID, 8)

	UCLOGIC_RDESC_FRAME_BUTTONS_BYTES(UCLOGIC_RDESC_V1_FRAME_ID, 8)

};

const size_t uclogic_rdesc_v1_frame_size =

			sizeof(uclogic_rdesc_v1_frame_arr);



/* Fixed report descriptor for (tweaked) v2 frame reports */

const __u8 uclogic_rdesc_v2_frame_arr[] = {

	UCLOGIC_RDESC_FRAME_BYTES(UCLOGIC_RDESC_V2_FRAME_ID, 12)

/* Fixed report descriptor for (tweaked) v2 frame button reports */

const __u8 uclogic_rdesc_v2_frame_buttons_arr[] = {

	UCLOGIC_RDESC_FRAME_BUTTONS_BYTES(UCLOGIC_RDESC_V2_FRAME_BUTTONS_ID,

					  12)

};

const size_t uclogic_rdesc_v2_frame_size =

			sizeof(uclogic_rdesc_v2_frame_arr);

const size_t uclogic_rdesc_v2_frame_buttons_size =

			sizeof(uclogic_rdesc_v2_frame_buttons_arr);



/* Fixed report descriptor for (tweaked) v2 frame touch ring reports */

const __u8 uclogic_rdesc_v2_frame_touch_ring_arr[] = {

	0x05, 0x01,         /*  Usage Page (Desktop),               */

	0x09, 0x07,         /*  Usage (Keypad),                     */

	0xA1, 0x01,         /*  Collection (Application),           */

	0x85, UCLOGIC_RDESC_V2_FRAME_TOUCH_RING_ID,

			    /*      Report ID (DIAL_ID),            */

	0x14,               /*      Logical Minimum (0),            */

	0x05, 0x0D,         /*      Usage Page (Digitizer),         */

	0x09, 0x39,         /*      Usage (Tablet Function Keys),   */

	0xA0,               /*      Collection (Physical),          */

	0x25, 0x01,         /*          Logical Maximum (1),        */

	0x75, 0x01,         /*          Report Size (1),            */

	0x05, 0x09,         /*          Usage Page (Button),        */

	0x09, 0x01,         /*          Usage (01h),                */

	0x95, 0x01,         /*          Report Count (1),           */

	0x81, 0x02,         /*          Input (Variable),           */

	0x95, 0x07,         /*          Report Count (7),           */

	0x81, 0x01,         /*          Input (Constant),           */

	0x75, 0x08,         /*          Report Size (8),            */

	0x95, 0x02,         /*          Report Count (2),           */

	0x81, 0x01,         /*          Input (Constant),           */

	0x05, 0x0D,         /*          Usage Page (Digitizer),     */

	0x0A, 0xFF, 0xFF,   /*          Usage (FFFFh),              */

	0x26, 0xFF, 0x00,   /*          Logical Maximum (255),      */

	0x95, 0x01,         /*          Report Count (1),           */

	0x81, 0x02,         /*          Input (Variable),           */

	0x05, 0x01,         /*          Usage Page (Desktop),       */

	0x09, 0x38,         /*          Usage (Wheel),              */

	0x95, 0x01,         /*          Report Count (1),           */

	0x15, 0x00,         /*          Logical Minimum (0),        */

	0x25, 0x0B,         /*          Logical Maximum (11),       */

	0x81, 0x02,         /*          Input (Variable),           */

	0x09, 0x30,         /*          Usage (X),                  */

	0x09, 0x31,         /*          Usage (Y),                  */

	0x14,               /*          Logical Minimum (0),        */

	0x25, 0x01,         /*          Logical Maximum (1),        */

	0x75, 0x01,         /*          Report Size (1),            */

	0x95, 0x02,         /*          Report Count (2),           */

	0x81, 0x02,         /*          Input (Variable),           */

	0x95, 0x2E,         /*          Report Count (46),          */

	0x81, 0x01,         /*          Input (Constant),           */

	0xC0,               /*      End Collection,                 */

	0xC0                /*  End Collection                      */

};

const size_t uclogic_rdesc_v2_frame_touch_ring_size =

			sizeof(uclogic_rdesc_v2_frame_touch_ring_arr);



/* Fixed report descriptor for Ugee EX07 frame */

const __u8 uclogic_rdesc_ugee_ex07_frame_arr[] = {

drivers/hid/hid-uclogic-rdesc.h

+15 −5
Original line number Diff line number Diff line
@@ -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[];