Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7e6645e authored by Ping Cheng's avatar Ping Cheng Committed by Jiri Kosina
Browse files

HID: wacom: Add missing ABS_MISC event and feature declaration for 27QHD 



27QHD has the same x_min/y_min (WACOM_CINTIQ_OFFSET) as other Cintiqs.

ABS_MISC event is required for PAD packet to work properly with
xf86-input-wacom.

Signed-off-by: default avatarPing Cheng <pingc@wacom.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 870fd0f5

drivers/hid/wacom_wac.c

+8 −3
Original line number Diff line number Diff line
@@ -778,6 +778,11 @@ static int wacom_intuos_irq(struct wacom_wac *wacom) 
			input_report_abs(input, ABS_X, be16_to_cpup((__be16 *)&data[4]));

			input_report_abs(input, ABS_Y, be16_to_cpup((__be16 *)&data[6]));

			input_report_abs(input, ABS_Z, be16_to_cpup((__be16 *)&data[8]));

			if ((data[2] & 0x07) | data[4] | data[5] | data[6] | data[7] | data[8] | data[9]) {

				input_report_abs(input, ABS_MISC, PAD_DEVICE_ID);

			} else {

				input_report_abs(input, ABS_MISC, 0);

			}

		} else if (features->type == CINTIQ_HYBRID) {

			/*

			 * Do not send hardware buttons under Android. They
@@ -2725,9 +2730,9 @@ static const struct wacom_features wacom_features_0xF6 = 
	  .oVid = USB_VENDOR_ID_WACOM, .oPid = 0xf8, .touch_max = 10,

	  .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };

static const struct wacom_features wacom_features_0x32A =

	{ "Wacom Cintiq 27QHD", 119740, 67520, 2047,

	  63, WACOM_27QHD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,

	  WACOM_27QHD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };

	{ "Wacom Cintiq 27QHD", 119740, 67520, 2047, 63,

	  WACOM_27QHD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,

	  WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };

static const struct wacom_features wacom_features_0x32B =

	{ "Wacom Cintiq 27QHD touch", 119740, 67520, 2047, 63,

	  WACOM_27QHD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,