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

Commit 7b226292 authored by Luosong's avatar Luosong Committed by Jiri Kosina
Browse files

HID: multitouch: Fix GeneralTouch products and add more PIDs 



GeneralTouch products should use the quirk SLOT_IS_CONTACTID
instead of SLOT_IS_CONTACTNUMBER.

Adding PIDs 0101,e100,0102,0106,010a from the new products.

Tested on new and older products by GeneralTouch engineers.

Signed-off-by: default avatarLuosong <android@generaltouch.com>
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 84fca9f3

drivers/hid/hid-ids.h

+5 −0
Original line number Diff line number Diff line
@@ -332,6 +332,11 @@ 
#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_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_0101 0x0101

#define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_0102 0x0102

#define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_0106 0x0106

#define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_010A 0x010a

#define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_E100 0xe100



#define USB_VENDOR_ID_GLAB		0x06c2

#define USB_DEVICE_ID_4_PHIDGETSERVO_30	0x0038

drivers/hid/hid-multitouch.c

+17 −2
Original line number Diff line number Diff line
@@ -250,12 +250,12 @@ static struct mt_class mt_classes[] = { 
	{ .name	= MT_CLS_GENERALTOUCH_TWOFINGERS,

		.quirks	= MT_QUIRK_NOT_SEEN_MEANS_UP |

			MT_QUIRK_VALID_IS_INRANGE |

			MT_QUIRK_SLOT_IS_CONTACTNUMBER,

			MT_QUIRK_SLOT_IS_CONTACTID,

		.maxcontacts = 2

	},

	{ .name	= MT_CLS_GENERALTOUCH_PWT_TENFINGERS,

		.quirks	= MT_QUIRK_NOT_SEEN_MEANS_UP |

			MT_QUIRK_SLOT_IS_CONTACTNUMBER

			MT_QUIRK_SLOT_IS_CONTACTID

	},



	{ .name = MT_CLS_FLATFROG,
@@ -1173,6 +1173,21 @@ static const struct hid_device_id mt_devices[] = { 
	{ .driver_data = MT_CLS_GENERALTOUCH_PWT_TENFINGERS,

		MT_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH,

			USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PWT_TENFINGERS) },

	{ .driver_data = MT_CLS_GENERALTOUCH_TWOFINGERS,

		MT_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH,

			USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_0101) },

	{ .driver_data = MT_CLS_GENERALTOUCH_PWT_TENFINGERS,

		MT_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH,

			USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_0102) },

	{ .driver_data = MT_CLS_GENERALTOUCH_PWT_TENFINGERS,

		MT_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH,

			USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_0106) },

	{ .driver_data = MT_CLS_GENERALTOUCH_PWT_TENFINGERS,

		MT_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH,

			USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_010A) },

	{ .driver_data = MT_CLS_GENERALTOUCH_PWT_TENFINGERS,

		MT_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH,

			USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_E100) },



	/* Gametel game controller */

	{ .driver_data = MT_CLS_NSMU,