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

Commit 8b4a0c1f authored by Ping Cheng's avatar Ping Cheng Committed by Dmitry Torokhov
Browse files

Input: wacom - use BTN_TOOL_FINGER to indicate touch device type 



Tested-by: default avatarChris Bagwell <chris@cnpbagwell.com>
Reviewed-by: default avatarChris Bagwell <chris@cnpbagwell.com>
Signed-off-by: default avatarPing Cheng <pingc@wacom.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 393f9ffb

drivers/input/tablet/wacom_sys.c

+1 −5
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static int wacom_parse_logical_collection(unsigned char *report, 


		/* Logical collection is only used by 3rd gen Bamboo Touch */

		features->pktlen = WACOM_PKGLEN_BBTOUCH3;

		features->device_type = BTN_TOOL_DOUBLETAP;

		features->device_type = BTN_TOOL_FINGER;



		/*

		 * Stylus and Touch have same active area
@@ -286,12 +286,10 @@ static int wacom_parse_hid(struct usb_interface *intf, 
						if (features->type == TABLETPC2FG) {

							/* need to reset back */

							features->pktlen = WACOM_PKGLEN_TPC2FG;

							features->device_type = BTN_TOOL_DOUBLETAP;

						}

						if (features->type == BAMBOO_PT) {

							/* need to reset back */

							features->pktlen = WACOM_PKGLEN_BBTOUCH;

							features->device_type = BTN_TOOL_DOUBLETAP;

							features->x_phy =

								get_unaligned_le16(&report[i + 5]);

							features->x_max =
@@ -325,7 +323,6 @@ static int wacom_parse_hid(struct usb_interface *intf, 
						if (features->type == TABLETPC2FG) {

							/* need to reset back */

							features->pktlen = WACOM_PKGLEN_TPC2FG;

							features->device_type = BTN_TOOL_DOUBLETAP;

							features->y_max =

								get_unaligned_le16(&report[i + 3]);

							features->y_phy =
@@ -334,7 +331,6 @@ static int wacom_parse_hid(struct usb_interface *intf, 
						} else if (features->type == BAMBOO_PT) {

							/* need to reset back */

							features->pktlen = WACOM_PKGLEN_BBTOUCH;

							features->device_type = BTN_TOOL_DOUBLETAP;

							features->y_phy =

								get_unaligned_le16(&report[i + 3]);

							features->y_max =

drivers/input/tablet/wacom_wac.c

+2 −2
Original line number Diff line number Diff line
@@ -1317,7 +1317,7 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev, 
		break;



	case TABLETPC2FG:

		if (features->device_type == BTN_TOOL_DOUBLETAP) {

		if (features->device_type == BTN_TOOL_FINGER) {



			input_mt_init_slots(input_dev, 2);

			input_set_abs_params(input_dev, ABS_MT_TOOL_TYPE,
@@ -1366,7 +1366,7 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev, 


		__set_bit(INPUT_PROP_POINTER, input_dev->propbit);



		if (features->device_type == BTN_TOOL_DOUBLETAP) {

		if (features->device_type == BTN_TOOL_FINGER) {

			__set_bit(BTN_LEFT, input_dev->keybit);

			__set_bit(BTN_FORWARD, input_dev->keybit);

			__set_bit(BTN_BACK, input_dev->keybit);