* [PATCH 1/1] Support PTP Stick and Touchpad device
@ 2017-06-14 8:47 Masaki Ota
2017-06-15 8:30 ` Benjamin Tissoires
0 siblings, 1 reply; 2+ messages in thread
From: Masaki Ota @ 2017-06-14 8:47 UTC (permalink / raw)
To: jikos, benjamin.tissoires; +Cc: linux-input, linux-kernel, masaki.ota
>From Masaki Ota <masaki.ota@jp.alps.com>
Support PTP Stick and Touchpad device.
This Touchpad is Precision Touchpad(PTP),
and Stick Pointer data is the same as Mouse.
So Stick Pointer works as Mouse.
Signed-off-by: Masaki Ota <masaki.ota@jp.alps.com>
---
drivers/hid/hid-ids.h | 2 ++
drivers/hid/hid-multitouch.c | 24 ++++++++++++++++++++++--
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 8ca1e8ce0af2..d36d4ac508f6 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -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
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 24d5b6deb571..4ffdda9d80da 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -161,6 +161,7 @@ static void mt_post_parse(struct mt_device *td);
#define MT_CLS_GENERALTOUCH_PWT_TENFINGERS 0x0109
#define MT_CLS_LG 0x010a
#define MT_CLS_VTL 0x0110
+#define MT_CLS_WIN_8_DUAL 0x0111
#define MT_DEFAULT_MAXCONTACT 10
#define MT_MAX_MAXCONTACT 250
@@ -278,6 +279,13 @@ static struct mt_class mt_classes[] = {
MT_QUIRK_CONTACT_CNT_ACCURATE |
MT_QUIRK_FORCE_GET_FEATURE,
},
+ { .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
+ },
{ }
};
@@ -512,7 +520,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 +588,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 +1300,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,
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/1] Support PTP Stick and Touchpad device
2017-06-14 8:47 [PATCH 1/1] Support PTP Stick and Touchpad device Masaki Ota
@ 2017-06-15 8:30 ` Benjamin Tissoires
0 siblings, 0 replies; 2+ messages in thread
From: Benjamin Tissoires @ 2017-06-15 8:30 UTC (permalink / raw)
To: Masaki Ota; +Cc: jikos, linux-input, linux-kernel, masaki.ota
On Jun 14 2017 or thereabouts, Masaki Ota wrote:
> From Masaki Ota <masaki.ota@jp.alps.com>
> Support PTP Stick and Touchpad device.
> This Touchpad is Precision Touchpad(PTP),
> and Stick Pointer data is the same as Mouse.
> So Stick Pointer works as Mouse.
>
> Signed-off-by: Masaki Ota <masaki.ota@jp.alps.com>
> ---
> drivers/hid/hid-ids.h | 2 ++
> drivers/hid/hid-multitouch.c | 24 ++++++++++++++++++++++--
> 2 files changed, 24 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index 8ca1e8ce0af2..d36d4ac508f6 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -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
> diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
> index 24d5b6deb571..4ffdda9d80da 100644
> --- a/drivers/hid/hid-multitouch.c
> +++ b/drivers/hid/hid-multitouch.c
> @@ -161,6 +161,7 @@ static void mt_post_parse(struct mt_device *td);
> #define MT_CLS_GENERALTOUCH_PWT_TENFINGERS 0x0109
> #define MT_CLS_LG 0x010a
> #define MT_CLS_VTL 0x0110
> +#define MT_CLS_WIN_8_DUAL 0x0111
This is not vendor specific, so we should use 0x0014 and move this above
in the list.
>
> #define MT_DEFAULT_MAXCONTACT 10
> #define MT_MAX_MAXCONTACT 250
> @@ -278,6 +279,13 @@ static struct mt_class mt_classes[] = {
> MT_QUIRK_CONTACT_CNT_ACCURATE |
> MT_QUIRK_FORCE_GET_FEATURE,
> },
> + { .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
> + },
Same than above, please move this just after MT_CLS_EXPORT_ALL_INPUTS.
> { }
> };
>
> @@ -512,7 +520,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 +588,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 +1300,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,
> --
> 2.11.0
>
Rest looks good to me.
Cheers,
Benjamin
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-06-15 8:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-14 8:47 [PATCH 1/1] Support PTP Stick and Touchpad device Masaki Ota
2017-06-15 8:30 ` Benjamin Tissoires
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.