|
 |
1dc13b |
From 8db05e73d6fc0f9aeb74fbe2ba109a7205d3819e Mon Sep 17 00:00:00 2001
|
|
|
1dc13b |
From: Aaron Armstrong Skomra <skomra@gmail.com>
|
|
|
1dc13b |
Date: Tue, 2 May 2017 09:48:56 -0700
|
|
|
1dc13b |
Subject: [PATCH 1/4] Support recent display devices on older kernels
|
|
|
1dc13b |
|
|
|
1dc13b |
Older kernels like 2.6.30 will end up with touches
|
|
|
1dc13b |
interpreted as relative events unless these devices
|
|
|
1dc13b |
are explicitly added.
|
|
|
1dc13b |
|
|
|
1dc13b |
Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
|
|
|
1dc13b |
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
1dc13b |
(cherry picked from commit 0318b1cda79261d73f04676dd662f98c84711747)
|
|
|
1dc13b |
---
|
|
|
1dc13b |
src/wcmUSB.c | 8 ++++++++
|
|
|
1dc13b |
src/wcmValidateDevice.c | 8 ++++++++
|
|
|
1dc13b |
2 files changed, 16 insertions(+)
|
|
|
1dc13b |
|
|
|
1dc13b |
diff --git a/src/wcmUSB.c b/src/wcmUSB.c
|
|
|
1dc13b |
index 2f9d93f..295286a 100644
|
|
|
1dc13b |
--- a/src/wcmUSB.c
|
|
|
1dc13b |
+++ b/src/wcmUSB.c
|
|
|
1dc13b |
@@ -287,6 +287,14 @@ static struct WacomModelDesc
|
|
|
1dc13b |
{ WACOM_VENDOR_ID, 0x57, 200000, 200000, &usbCintiqV5, "DTK2241" },
|
|
|
1dc13b |
{ WACOM_VENDOR_ID, 0x59, 200000, 200000, &usbCintiqV5, "DTH2242" },
|
|
|
1dc13b |
{ WACOM_VENDOR_ID, 0x5B, 200000, 200000, &usbCintiqV5, "Cintiq 22HDT" },
|
|
|
1dc13b |
+ { WACOM_VENDOR_ID, 0x34A, 200000, 200000, &usbCintiqV5, "Mobilestudio Pro 13" }, /* Touch */
|
|
|
1dc13b |
+ { WACOM_VENDOR_ID, 0x34B, 200000, 200000, &usbCintiqV5, "MobileStudio Pro 16" }, /* Touch */
|
|
|
1dc13b |
+ { WACOM_VENDOR_ID, 0x34D, 200000, 200000, &usbCintiqV5, "MobileStudio Pro 13" },
|
|
|
1dc13b |
+ { WACOM_VENDOR_ID, 0x34E, 200000, 200000, &usbCintiqV5, "MobileStudio Pro 16" },
|
|
|
1dc13b |
+ { WACOM_VENDOR_ID, 0x34F, 200000, 200000, &usbCintiqV5, "Cintiq 13 FHD Pro" },
|
|
|
1dc13b |
+ { WACOM_VENDOR_ID, 0x350, 200000, 200000, &usbCintiqV5, "Cintiq 16 UHD Pro" },
|
|
|
1dc13b |
+ { WACOM_VENDOR_ID, 0x353, 200000, 200000, &usbCintiqV5, "Cintiq 13 FHD Pro" }, /* Touch */
|
|
|
1dc13b |
+ { WACOM_VENDOR_ID, 0x354, 200000, 200000, &usbCintiqV5, "Cintiq 16 UHD Pro" }, /* Touch */
|
|
|
1dc13b |
|
|
|
1dc13b |
{ WACOM_VENDOR_ID, 0x90, 100000, 100000, &usbTabletPC, "TabletPC 0x90" },
|
|
|
1dc13b |
{ WACOM_VENDOR_ID, 0x93, 100000, 100000, &usbTabletPC, "TabletPC 0x93" },
|
|
|
1dc13b |
diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
|
|
|
1dc13b |
index fd27264..0da5076 100644
|
|
|
1dc13b |
--- a/src/wcmValidateDevice.c
|
|
|
1dc13b |
+++ b/src/wcmValidateDevice.c
|
|
|
1dc13b |
@@ -309,6 +309,14 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo)
|
|
|
1dc13b |
case 0x5D: /* DTH2242 Touch */
|
|
|
1dc13b |
case 0x5E: /* Cintiq 22HDT Touch */
|
|
|
1dc13b |
case 0x304:/* Cintiq 13HD */
|
|
|
1dc13b |
+ case 0x34A:/* MobileStudio Pro 13 Touch */
|
|
|
1dc13b |
+ case 0x34B:/* MobileStudio Pro 16 Touch */
|
|
|
1dc13b |
+ case 0x34D:/* MobileStudio Pro 13 */
|
|
|
1dc13b |
+ case 0x34E:/* MobileStudio Pro 13 */
|
|
|
1dc13b |
+ case 0x34F:/* Cintiq Pro 13 FHD */
|
|
|
1dc13b |
+ case 0x350:/* Cintiq Pro 16 UHD */
|
|
|
1dc13b |
+ case 0x353:/* Cintiq Pro 13 FHD Touch */
|
|
|
1dc13b |
+ case 0x354:/* Cintiq Pro 13 UHD Touch */
|
|
|
1dc13b |
TabletSetFeature(priv->common, WCM_LCD);
|
|
|
1dc13b |
break;
|
|
|
1dc13b |
}
|
|
|
1dc13b |
--
|
|
|
1dc13b |
2.13.6
|
|
|
1dc13b |
|