Commit f5ff4e1e authored by Xianhan Yu's avatar Xianhan Yu Committed by Jiri Kosina
Browse files

HID: multitouch: add support for GeneralTouch multi-touchscreen 



Fix the touch-up no response problem on GeneralTouch twofingers touchscreen and
modify the driver for new GeneralTouch PWT touchscreen.

Signed-off-by: default avatarXianhan Yu <aroundight77@gmail.com>
Reviewed-by Benjamin Tissoires <benjamin.tissoires@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent dfeefd10

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ 


#define USB_VENDOR_ID_GENERAL_TOUCH	0x0dfc

#define USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS 0x0003

#define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PWT_TENFINGERS 0x0100



#define USB_VENDOR_ID_GLAB		0x06c2

#define USB_DEVICE_ID_4_PHIDGETSERVO_30	0x0038

drivers/hid/hid-multitouch.c

+17 −1
Original line number Diff line number Diff line
@@ -115,6 +115,8 @@ struct mt_device { 
#define MT_CLS_EGALAX_SERIAL			0x0104

#define MT_CLS_TOPSEED				0x0105

#define MT_CLS_PANASONIC			0x0106

#define MT_CLS_GENERALTOUCH_TWOFINGERS		0x0107

#define MT_CLS_GENERALTOUCH_PWT_TENFINGERS	0x0108



#define MT_DEFAULT_MAXCONTACT	10
@@ -215,6 +217,17 @@ static struct mt_class mt_classes[] = { 
	{ .name = MT_CLS_PANASONIC,

		.quirks = MT_QUIRK_NOT_SEEN_MEANS_UP,

		.maxcontacts = 4 },

	{ .name	= MT_CLS_GENERALTOUCH_TWOFINGERS,

		.quirks	= MT_QUIRK_NOT_SEEN_MEANS_UP |

			MT_QUIRK_VALID_IS_INRANGE |

			MT_QUIRK_SLOT_IS_CONTACTNUMBER,

		.maxcontacts = 2

	},

	{ .name	= MT_CLS_GENERALTOUCH_PWT_TENFINGERS,

		.quirks	= MT_QUIRK_NOT_SEEN_MEANS_UP |

			MT_QUIRK_SLOT_IS_CONTACTNUMBER,

		.maxcontacts = 10

	},



	{ }

};
@@ -929,9 +942,12 @@ static const struct hid_device_id mt_devices[] = { 
			USB_DEVICE_ID_ELO_TS2515) },



	/* GeneralTouch panel */

	{ .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER,

	{ .driver_data = MT_CLS_GENERALTOUCH_TWOFINGERS,

		MT_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH,

			USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS) },

	{ .driver_data = MT_CLS_GENERALTOUCH_PWT_TENFINGERS,

		MT_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH,

			USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PWT_TENFINGERS) },



	/* Gametel game controller */

	{ .driver_data = MT_CLS_DEFAULT,