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

Commit 5572da08 authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Jiri Kosina
Browse files

HID: hid-mulitouch: add support for the 'Sensing Win7-TwoFinger' 



Added support for the 'Sensing Win7-TwoFinger' panel by GeneralTouch found on some tablets.

Because of conflicting VID/PID, this conflicts with previous support for some
single-touch panels by GeneralTouch

Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@enac.fr>
Signed-off-by: default avatarStéphane Chatty <chatty@enac.fr>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent a3b5e577

drivers/hid/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -294,6 +294,7 @@ config HID_MULTITOUCH 
	  Say Y here if you have one of the following devices:

	  Say Y here if you have one of the following devices:

	  - PixCir touchscreen

	  - PixCir touchscreen

	  - Cypress TrueTouch

	  - Cypress TrueTouch

	  - 'Sensing Win7-TwoFinger' panel by GeneralTouch





config HID_NTRIG

config HID_NTRIG

	tristate "N-Trig touch screen"

	tristate "N-Trig touch screen"

drivers/hid/hid-core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1309,6 +1309,7 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0012) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0012) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },
@@ -1614,7 +1615,6 @@ static const struct hid_device_id hid_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC5UH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC5UH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC4UM) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC4UM) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0001) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0002) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0002) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0003) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0003) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0004) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0004) },

drivers/hid/hid-ids.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -228,6 +228,7 @@ 
#define USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR	0x0002

#define USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR	0x0002





#define USB_VENDOR_ID_GENERAL_TOUCH	0x0dfc

#define USB_VENDOR_ID_GENERAL_TOUCH	0x0dfc

#define USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS 0x0001





#define USB_VENDOR_ID_GLAB		0x06c2

#define USB_VENDOR_ID_GLAB		0x06c2

#define USB_DEVICE_ID_4_PHIDGETSERVO_30	0x0038

#define USB_DEVICE_ID_4_PHIDGETSERVO_30	0x0038

drivers/hid/hid-multitouch.c

+17 −1
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ MODULE_LICENSE("GPL"); 
#define MT_QUIRK_NOT_SEEN_MEANS_UP	(1 << 0)

#define MT_QUIRK_NOT_SEEN_MEANS_UP	(1 << 0)

#define MT_QUIRK_SLOT_IS_CONTACTID	(1 << 1)

#define MT_QUIRK_SLOT_IS_CONTACTID	(1 << 1)

#define MT_QUIRK_CYPRESS	(1 << 2)

#define MT_QUIRK_CYPRESS	(1 << 2)

#define MT_QUIRK_SLOT_IS_CONTACTNUMBER	(1 << 3)





struct mt_slot {

struct mt_slot {

	__s32 x, y, p, w, h;

	__s32 x, y, p, w, h;
@@ -63,7 +64,8 @@ struct mt_class { 
/* classes of device behavior */

/* classes of device behavior */

#define MT_CLS_DEFAULT 0

#define MT_CLS_DEFAULT 0

#define MT_CLS_DUAL1 1

#define MT_CLS_DUAL1 1

#define MT_CLS_CYPRESS 2

#define MT_CLS_DUAL2 2

#define MT_CLS_CYPRESS 3





/*

/*

 * these device-dependent functions determine what slot corresponds

 * these device-dependent functions determine what slot corresponds
@@ -75,6 +77,11 @@ static int slot_is_contactid(struct mt_device *td) 
	return td->curdata.contactid;

	return td->curdata.contactid;

}

}





static int slot_is_contactnumber(struct mt_device *td)

{

	return td->num_received;

}



static int cypress_compute_slot(struct mt_device *td)

static int cypress_compute_slot(struct mt_device *td)

{

{

	if (td->curdata.contactid != 0 || td->num_received == 0)

	if (td->curdata.contactid != 0 || td->num_received == 0)
@@ -105,6 +112,7 @@ static int find_slot_from_contactid(struct mt_device *td) 
struct mt_class mt_classes[] = {

struct mt_class mt_classes[] = {

	{ 0, 0, 0, 10 },                             /* MT_CLS_DEFAULT */

	{ 0, 0, 0, 10 },                             /* MT_CLS_DEFAULT */

	{ MT_QUIRK_SLOT_IS_CONTACTID, 0, 0, 2 },     /* MT_CLS_DUAL1 */

	{ MT_QUIRK_SLOT_IS_CONTACTID, 0, 0, 2 },     /* MT_CLS_DUAL1 */

	{ MT_QUIRK_SLOT_IS_CONTACTNUMBER, 0, 0, 10 },    /* MT_CLS_DUAL2 */

	{ MT_QUIRK_CYPRESS | MT_QUIRK_NOT_SEEN_MEANS_UP, 0, 0, 10 }, /* MT_CLS_CYPRESS */

	{ MT_QUIRK_CYPRESS | MT_QUIRK_NOT_SEEN_MEANS_UP, 0, 0, 10 }, /* MT_CLS_CYPRESS */

};

};
@@ -237,6 +245,9 @@ static int mt_compute_slot(struct mt_device *td) 
	if (cls->quirks & MT_QUIRK_CYPRESS)

	if (cls->quirks & MT_QUIRK_CYPRESS)

		return cypress_compute_slot(td);

		return cypress_compute_slot(td);





	if (cls->quirks & MT_QUIRK_SLOT_IS_CONTACTNUMBER)

		return slot_is_contactnumber(td);



	return find_slot_from_contactid(td);

	return find_slot_from_contactid(td);

}

}
@@ -441,6 +452,11 @@ static const struct hid_device_id mt_devices[] = { 
		HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS,

		HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS,

			USB_DEVICE_ID_CYPRESS_TRUETOUCH) },

			USB_DEVICE_ID_CYPRESS_TRUETOUCH) },





	/* GeneralTouch panel */

	{ .driver_data = MT_CLS_DUAL2,

		HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH,

			USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS) },



	/* PixCir-based panels */

	/* PixCir-based panels */

	{ .driver_data = MT_CLS_DUAL1,

	{ .driver_data = MT_CLS_DUAL1,

		HID_USB_DEVICE(USB_VENDOR_ID_HANVON,

		HID_USB_DEVICE(USB_VENDOR_ID_HANVON,