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

Commit 504c932c authored by Masaki Ota's avatar Masaki Ota Committed by Jiri Kosina
Browse files

HID: multitouch: Support PTP Stick and Touchpad device 



Support PTP Stick and Touchpad device. This Touchpad is Precision Touchpad
(PTP), and Stick Pointer data is the same as Mouse; Stick Pointer works as
Mouse.

[jkosina@suse.cz: changelog deuglification]
Signed-off-by: default avatarMasaki Ota <masaki.ota@jp.alps.com>
Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent b45edc2d

drivers/hid/hid-ids.h

+2 −0
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ 


#define USB_VENDOR_ID_ALPS_JP		0x044E

#define HID_DEVICE_ID_ALPS_U1_DUAL	0x120B

#define HID_DEVICE_ID_ALPS_U1_DUAL_PTP	0x121F

#define HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP	0x1220



#define USB_VENDOR_ID_AMI		0x046b

#define USB_DEVICE_ID_AMI_VIRT_KEYBOARD_AND_MOUSE	0xff10

drivers/hid/hid-multitouch.c

+21 −2
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ static void mt_post_parse(struct mt_device *td); 
/* reserved					0x0011 */

#define MT_CLS_WIN_8				0x0012

#define MT_CLS_EXPORT_ALL_INPUTS		0x0013

#define MT_CLS_WIN_8_DUAL			0x0014



/* vendor specific classes */

#define MT_CLS_3M				0x0101
@@ -217,6 +218,12 @@ static struct mt_class mt_classes[] = { 
		.quirks = MT_QUIRK_ALWAYS_VALID |

			MT_QUIRK_CONTACT_CNT_ACCURATE,

		.export_all_inputs = true },

	{ .name = MT_CLS_WIN_8_DUAL,

		.quirks = MT_QUIRK_ALWAYS_VALID |

			MT_QUIRK_IGNORE_DUPLICATES |

			MT_QUIRK_HOVERING |

			MT_QUIRK_CONTACT_CNT_ACCURATE,

		.export_all_inputs = true },



	/*

	 * vendor specific classes
@@ -512,7 +519,8 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi, 
			mt_store_field(usage, td, hi);

			return 1;

		case HID_DG_CONFIDENCE:

			if (cls->name == MT_CLS_WIN_8 &&

			if ((cls->name == MT_CLS_WIN_8 ||

				cls->name == MT_CLS_WIN_8_DUAL) &&

				field->application == HID_DG_TOUCHPAD)

				cls->quirks |= MT_QUIRK_CONFIDENCE;

			mt_store_field(usage, td, hi);
@@ -579,7 +587,8 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi, 
		 * MS PTP spec says that external buttons left and right have

		 * usages 2 and 3.

		 */

		if (cls->name == MT_CLS_WIN_8 &&

		if ((cls->name == MT_CLS_WIN_8 ||

			cls->name == MT_CLS_WIN_8_DUAL) &&

		    field->application == HID_DG_TOUCHPAD &&

		    (usage->hid & HID_USAGE) > 1)

			code--;
@@ -1290,6 +1299,16 @@ static const struct hid_device_id mt_devices[] = { 
		MT_USB_DEVICE(USB_VENDOR_ID_3M,

			USB_DEVICE_ID_3M3266) },



	/* Alps devices */

	{ .driver_data = MT_CLS_WIN_8_DUAL,

		HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,

			USB_VENDOR_ID_ALPS_JP,

			HID_DEVICE_ID_ALPS_U1_DUAL_PTP) },

	{ .driver_data = MT_CLS_WIN_8_DUAL,

		HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,

			USB_VENDOR_ID_ALPS_JP,

			HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP) },



	/* Anton devices */

	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,

		MT_USB_DEVICE(USB_VENDOR_ID_ANTON,