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

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

HID: hid-multitouch: add support for Cypress TrueTouch panels 



Added support for Cypress TrueTouch panels, which detect up to 10 fingers

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 5519cab4

drivers/hid/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -293,6 +293,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





config HID_NTRIG

config HID_NTRIG

	tristate "N-Trig touch screen"

	tristate "N-Trig touch screen"

drivers/hid/hid-core.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1298,6 +1298,7 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_TRUETOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },

drivers/hid/hid-ids.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -180,6 +180,7 @@ 
#define USB_DEVICE_ID_CYPRESS_BARCODE_1	0xde61

#define USB_DEVICE_ID_CYPRESS_BARCODE_1	0xde61

#define USB_DEVICE_ID_CYPRESS_BARCODE_2	0xde64

#define USB_DEVICE_ID_CYPRESS_BARCODE_2	0xde64

#define USB_DEVICE_ID_CYPRESS_BARCODE_3	0xbca1

#define USB_DEVICE_ID_CYPRESS_BARCODE_3	0xbca1

#define USB_DEVICE_ID_CYPRESS_TRUETOUCH	0xc001





#define USB_VENDOR_ID_DEALEXTREAME	0x10c5

#define USB_VENDOR_ID_DEALEXTREAME	0x10c5

#define USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701	0x819a

#define USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701	0x819a

drivers/hid/hid-multitouch.c

+19 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ MODULE_LICENSE("GPL"); 
/* quirks to control the device */

/* quirks to control the device */

#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)





struct mt_slot {

struct mt_slot {

	__s32 x, y, p, w, h;

	__s32 x, y, p, w, h;
@@ -62,6 +63,7 @@ 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





/*

/*

 * these device-dependent functions determine what slot corresponds

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

	return td->curdata.contactid;

}

}





static int cypress_compute_slot(struct mt_device *td)

{

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

		return td->curdata.contactid;

	else

		return -1;

}



static int find_slot_from_contactid(struct mt_device *td)

static int find_slot_from_contactid(struct mt_device *td)

{

{

	int i;

	int i;
@@ -95,6 +105,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_CYPRESS | MT_QUIRK_NOT_SEEN_MEANS_UP, 0, 0, 10 }, /* MT_CLS_CYPRESS */

};

};





static void mt_feature_mapping(struct hid_device *hdev, struct hid_input *hi,

static void mt_feature_mapping(struct hid_device *hdev, struct hid_input *hi,
@@ -223,6 +234,9 @@ static int mt_compute_slot(struct mt_device *td) 
	if (cls->quirks & MT_QUIRK_SLOT_IS_CONTACTID)

	if (cls->quirks & MT_QUIRK_SLOT_IS_CONTACTID)

		return slot_is_contactid(td);

		return slot_is_contactid(td);





	if (cls->quirks & MT_QUIRK_CYPRESS)

		return cypress_compute_slot(td);



	return find_slot_from_contactid(td);

	return find_slot_from_contactid(td);

}

}
@@ -422,6 +436,11 @@ static void mt_remove(struct hid_device *hdev) 




static const struct hid_device_id mt_devices[] = {

static const struct hid_device_id mt_devices[] = {





	/* Cypress panel */

	{ .driver_data = MT_CLS_CYPRESS,

		HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS,

			USB_DEVICE_ID_CYPRESS_TRUETOUCH) },



	/* 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,