HID: hid-multitouch: add support for PenMount dual-touch panel
This patch adds PenMount support to hid-multitouch. A new class MT_CLS_CONFIDENCE is defined for PenMount, since it uses HID_DG_CONFIDENCE as the valid flag. Signed-off-by: John Sung <penmount.touch@gmail.com> [benjamin.tissoires@enac.fr: rebased on top of last_index_field changes] Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Acked-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
parent
2955caed8b
commit
6ab3a9a63f
|
@ -313,6 +313,7 @@ config HID_MULTITOUCH
|
||||||
- Cypress TrueTouch panels
|
- Cypress TrueTouch panels
|
||||||
- Hanvon dual touch panels
|
- Hanvon dual touch panels
|
||||||
- IrTouch Infrared USB panels
|
- IrTouch Infrared USB panels
|
||||||
|
- PenMount dual touch panels
|
||||||
- Pixcir dual touch panels
|
- Pixcir dual touch panels
|
||||||
- 'Sensing Win7-TwoFinger' panel by GeneralTouch
|
- 'Sensing Win7-TwoFinger' panel by GeneralTouch
|
||||||
- eGalax dual-touch panels, including the
|
- eGalax dual-touch panels, including the
|
||||||
|
|
|
@ -1438,6 +1438,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
|
||||||
{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18) },
|
{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18) },
|
||||||
{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) },
|
{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) },
|
||||||
{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
|
{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
|
||||||
|
{ HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT, USB_DEVICE_ID_PENMOUNT_PCI) },
|
||||||
{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
|
{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
|
||||||
{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },
|
{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },
|
||||||
{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },
|
{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },
|
||||||
|
|
|
@ -484,6 +484,9 @@
|
||||||
#define USB_VENDOR_ID_PANTHERLORD 0x0810
|
#define USB_VENDOR_ID_PANTHERLORD 0x0810
|
||||||
#define USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK 0x0001
|
#define USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK 0x0001
|
||||||
|
|
||||||
|
#define USB_VENDOR_ID_PENMOUNT 0x14e1
|
||||||
|
#define USB_DEVICE_ID_PENMOUNT_PCI 0x3500
|
||||||
|
|
||||||
#define USB_VENDOR_ID_PETALYNX 0x18b1
|
#define USB_VENDOR_ID_PETALYNX 0x18b1
|
||||||
#define USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE 0x0037
|
#define USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE 0x0037
|
||||||
|
|
||||||
|
|
|
@ -89,6 +89,7 @@ struct mt_class {
|
||||||
#define MT_CLS_EGALAX 5
|
#define MT_CLS_EGALAX 5
|
||||||
#define MT_CLS_STANTUM 6
|
#define MT_CLS_STANTUM 6
|
||||||
#define MT_CLS_3M 7
|
#define MT_CLS_3M 7
|
||||||
|
#define MT_CLS_CONFIDENCE 8
|
||||||
|
|
||||||
#define MT_DEFAULT_MAXCONTACT 10
|
#define MT_DEFAULT_MAXCONTACT 10
|
||||||
|
|
||||||
|
@ -156,6 +157,8 @@ struct mt_class mt_classes[] = {
|
||||||
.sn_move = 2048,
|
.sn_move = 2048,
|
||||||
.sn_width = 128,
|
.sn_width = 128,
|
||||||
.sn_height = 128 },
|
.sn_height = 128 },
|
||||||
|
{ .name = MT_CLS_CONFIDENCE,
|
||||||
|
.quirks = MT_QUIRK_VALID_IS_CONFIDENCE },
|
||||||
|
|
||||||
{ }
|
{ }
|
||||||
};
|
};
|
||||||
|
@ -584,6 +587,11 @@ static const struct hid_device_id mt_devices[] = {
|
||||||
HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS,
|
HID_USB_DEVICE(USB_VENDOR_ID_IRTOUCHSYSTEMS,
|
||||||
USB_DEVICE_ID_IRTOUCH_INFRARED_USB) },
|
USB_DEVICE_ID_IRTOUCH_INFRARED_USB) },
|
||||||
|
|
||||||
|
/* PenMount panels */
|
||||||
|
{ .driver_data = MT_CLS_CONFIDENCE,
|
||||||
|
HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT,
|
||||||
|
USB_DEVICE_ID_PENMOUNT_PCI) },
|
||||||
|
|
||||||
/* PixCir-based panels */
|
/* PixCir-based panels */
|
||||||
{ .driver_data = MT_CLS_DUAL_INRANGE_CONTACTID,
|
{ .driver_data = MT_CLS_DUAL_INRANGE_CONTACTID,
|
||||||
HID_USB_DEVICE(USB_VENDOR_ID_HANVON,
|
HID_USB_DEVICE(USB_VENDOR_ID_HANVON,
|
||||||
|
|
Reference in New Issue