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

HID: uclogic: Do not focus on touch ring only 



Accommodate both touch ring and touch strip in naming throughout
hid-uclogic by talking about abstract "touch" instead of "touch ring",
wherever possible.

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 945d5dd5

drivers/hid/hid-uclogic-core.c

+9 −11
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static int uclogic_input_configured(struct hid_device *hdev, 
			 * Disable EV_MSC reports for touch ring interfaces to

			 * make the Wacom driver pickup touch ring extents

			 */

			if (frame->touch_ring_byte > 0)

			if (frame->touch_byte > 0)

				__clear_bit(EV_MSC, hi->input->evbit);

		}

	}
@@ -351,9 +351,8 @@ 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) {

		/* 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) {

		if (frame->touch_byte > 0 && frame->touch_byte < size &&

		    data[frame->touch_byte] == 0) {

			data[frame->dev_id_byte] = 0;

		} else {

			data[frame->dev_id_byte] = 0xf;
@@ -387,16 +386,15 @@ static int uclogic_raw_event_frame( 
	}



	/* 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 (frame->touch_byte > 0 && frame->touch_byte < size &&

	    frame->touch_flip_at != 0) {

		__s8 value = data[frame->touch_byte];

		if (value != 0) {

			value = frame->touch_ring_flip_at - value;

			value = frame->touch_flip_at - value;

			if (value < 0)

				value = frame->touch_ring_max + value;

				value = frame->touch_max + value;



			data[frame->touch_ring_byte] = value;

			data[frame->touch_byte] = value;

		}

	}

drivers/hid/hid-uclogic-params.c

+10 −10
Original line number Diff line number Diff line
@@ -93,10 +93,10 @@ static void uclogic_params_frame_hid_dbg( 
	hid_dbg(hdev, "\t\t.suffix = %s\n", frame->suffix);

	hid_dbg(hdev, "\t\t.re_lsb = %u\n", frame->re_lsb);

	hid_dbg(hdev, "\t\t.dev_id_byte = %u\n", frame->dev_id_byte);

	hid_dbg(hdev, "\t\t.touch_ring_byte = %u\n", frame->touch_ring_byte);

	hid_dbg(hdev, "\t\t.touch_ring_max = %hhd\n", frame->touch_ring_max);

	hid_dbg(hdev, "\t\t.touch_ring_flip_at = %hhd\n",

		frame->touch_ring_flip_at);

	hid_dbg(hdev, "\t\t.touch_byte = %u\n", frame->touch_byte);

	hid_dbg(hdev, "\t\t.touch_max = %hhd\n", frame->touch_max);

	hid_dbg(hdev, "\t\t.touch_flip_at = %hhd\n",

		frame->touch_flip_at);

	hid_dbg(hdev, "\t\t.bitmap_dial_byte = %u\n",

		frame->bitmap_dial_byte);

}
@@ -877,7 +877,7 @@ static int uclogic_params_huion_init(struct uclogic_params *params, 
					&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);

					UCLOGIC_RDESC_V2_FRAME_TOUCH_ID);

			if (rc != 0) {

				hid_err(hdev,

					"failed creating v2 frame touch ring parameters: %d\n",
@@ -886,10 +886,10 @@ static int uclogic_params_huion_init(struct uclogic_params *params, 
			}

			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;

				UCLOGIC_RDESC_V2_FRAME_TOUCH_DEV_ID_BYTE;

			p.frame_list[1].touch_byte = 5;

			p.frame_list[1].touch_max = 12;

			p.frame_list[1].touch_flip_at = 6;



			/* Create v2 frame dial parameters */

			rc = uclogic_params_frame_init_with_desc(
@@ -917,7 +917,7 @@ static int uclogic_params_huion_init(struct uclogic_params *params, 
				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;

				UCLOGIC_RDESC_V2_FRAME_TOUCH_ID;

			p.pen.subreport_list[2].value = 0xf1;

			p.pen.subreport_list[2].id =

				UCLOGIC_RDESC_V2_FRAME_DIAL_ID;

drivers/hid/hid-uclogic-params.h

+14 −13
Original line number Diff line number Diff line
@@ -128,31 +128,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. The ID byte will be set

	 * to zero whenever the byte pointed by "touch_ring_byte" is zero, if

	 * to zero whenever the byte pointed by "touch_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.

	 * Offset of the touch ring/strip 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;



	unsigned int touch_byte;

	/*

	 * The value to anchor the reversed reports at.

	 * The value to anchor the reversed touch ring/strip reports at.

	 * I.e. one, if the reports should be flipped without offset.

	 * Zero if no reversal should be done.

	 * Only valid if "touch_byte" is valid and not zero.

	 */

	__s8 touch_flip_at;

	/*

	 * Maximum value of the touch ring/strip report around which the value

	 * should be wrapped when flipping according to "touch_flip_at".

	 * The minimum valid value is considered to be one, with zero being

	 * out-of-proximity (finger lift) value.

	 * Only valid if "touch_flip_at" is valid and not zero.

	 */

	__s8 touch_ring_flip_at;

	__s8 touch_max;

	/*

	 * Offset of the bitmap dial byte, in the report. Zero if not present.

	 * Only valid if "id" is not zero. A bitmap dial sends reports with a

drivers/hid/hid-uclogic-rdesc.c

+2 −2
Original line number Diff line number Diff line
@@ -718,8 +718,8 @@ 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),            */

	0x85, UCLOGIC_RDESC_V2_FRAME_TOUCH_ID,

			    /*      Report ID (TOUCH_ID),           */

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

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

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

drivers/hid/hid-uclogic-rdesc.h

+4 −4
Original line number Diff line number Diff line
@@ -131,15 +131,15 @@ extern const size_t uclogic_rdesc_v1_frame_size; 
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

/* Report ID for tweaked v2 frame touch ring/strip reports */

#define UCLOGIC_RDESC_V2_FRAME_TOUCH_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

/* Device ID byte offset in v2 frame touch ring/strip reports */

#define UCLOGIC_RDESC_V2_FRAME_TOUCH_DEV_ID_BYTE	0x4



/* Report ID for tweaked v2 frame dial reports */

#define UCLOGIC_RDESC_V2_FRAME_DIAL_ID 0xf9