|
 |
1dc13b |
From 8bda3dad98f3e1d62bf4499ecb95e2692830adaa Mon Sep 17 00:00:00 2001
|
|
|
1dc13b |
From: Jason Gerecke <killertofu@gmail.com>
|
|
|
1dc13b |
Date: Thu, 10 Aug 2017 15:35:43 -0700
|
|
|
1dc13b |
Subject: [PATCH 4/4] Correct device flags for multiple devices
|
|
|
1dc13b |
|
|
|
1dc13b |
The device flags set in wcmDeviceTypeKeys must be set properly in order
|
|
|
1dc13b |
for the driver to correctly identify and use specific tablet features.
|
|
|
1dc13b |
Several devices are missing flags that e.g. indicate they support
|
|
|
1dc13b |
pen rotation or have touch rings.
|
|
|
1dc13b |
|
|
|
1dc13b |
Fixes: 0318b1c ("Support recent display devices on older kernels")
|
|
|
1dc13b |
Fixes: 3578b91 ("Add support for Cintiq 22HDT and 13HD, DTK2241 and DTH2242.")
|
|
|
1dc13b |
Fixes: df7f165 ("Add tablet_type to WacomModel")
|
|
|
1dc13b |
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
|
|
|
1dc13b |
Reviewed-by: Ping Cheng <ping.cheng@wacom.com>
|
|
|
1dc13b |
(cherry picked from commit b30e2d27fdb30ff4b425fc62432cab636fe163b9)
|
|
|
1dc13b |
---
|
|
|
1dc13b |
src/wcmValidateDevice.c | 20 +++++++++++++-------
|
|
|
1dc13b |
1 file changed, 13 insertions(+), 7 deletions(-)
|
|
|
1dc13b |
|
|
|
1dc13b |
diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
|
|
|
1dc13b |
index 8eac0dd..21ccd5f 100644
|
|
|
1dc13b |
--- a/src/wcmValidateDevice.c
|
|
|
1dc13b |
+++ b/src/wcmValidateDevice.c
|
|
|
1dc13b |
@@ -199,7 +199,12 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo)
|
|
|
1dc13b |
{
|
|
|
1dc13b |
case 0xF8: /* Cintiq 24HDT */
|
|
|
1dc13b |
case 0xF4: /* Cintiq 24HD */
|
|
|
1dc13b |
- TabletSetFeature(priv->common, WCM_DUALRING | WCM_LCD);
|
|
|
1dc13b |
+ TabletSetFeature(priv->common, WCM_DUALRING);
|
|
|
1dc13b |
+ /* fall through */
|
|
|
1dc13b |
+
|
|
|
1dc13b |
+ case 0x34D: /* MobileStudio Pro 13 */
|
|
|
1dc13b |
+ case 0x34E: /* MobileStudio Pro 13 */
|
|
|
1dc13b |
+ TabletSetFeature(priv->common, WCM_LCD);
|
|
|
1dc13b |
/* fall through */
|
|
|
1dc13b |
|
|
|
1dc13b |
case 0x357: /* Intuos Pro 2 M */
|
|
|
1dc13b |
@@ -300,23 +305,24 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo)
|
|
|
1dc13b |
case 0xED: /* TPC with 1FGT */
|
|
|
1dc13b |
case 0x90: /* TPC */
|
|
|
1dc13b |
case 0x97: /* TPC */
|
|
|
1dc13b |
+ case 0x9F: /* TPC */
|
|
|
1dc13b |
case 0xEF: /* TPC */
|
|
|
1dc13b |
TabletSetFeature(priv->common, WCM_TPC);
|
|
|
1dc13b |
break;
|
|
|
1dc13b |
|
|
|
1dc13b |
- case 0x9F:
|
|
|
1dc13b |
+ case 0x304:/* Cintiq 13HD */
|
|
|
1dc13b |
+ case 0x34F:/* Cintiq Pro 13 FHD */
|
|
|
1dc13b |
+ case 0x350:/* Cintiq Pro 16 UHD */
|
|
|
1dc13b |
+ TabletSetFeature(priv->common, WCM_ROTATION);
|
|
|
1dc13b |
+ /* fall-through */
|
|
|
1dc13b |
+
|
|
|
1dc13b |
case 0xF6: /* Cintiq 24HDT Touch */
|
|
|
1dc13b |
case 0x57: /* DTK2241 */
|
|
|
1dc13b |
case 0x59: /* DTH2242 Pen */
|
|
|
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 |
case 0x35A:/* DTH-1152*/
|
|
|
1dc13b |
--
|
|
|
1dc13b |
2.13.6
|
|
|
1dc13b |
|