|
 |
1dc13b |
From eeb5d7456248cda28ba62fe2e4978bc25ff6086a Mon Sep 17 00:00:00 2001
|
|
|
1dc13b |
From: Aaron Armstrong Skomra <skomra@gmail.com>
|
|
|
1dc13b |
Date: Thu, 13 Jul 2017 12:08:03 -0700
|
|
|
1dc13b |
Subject: [PATCH 2/4] Support DTH-1152 on older kernels
|
|
|
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 b0a055425dfb983163b1d3c673a36aebf9536430)
|
|
|
1dc13b |
---
|
|
|
1dc13b |
src/wcmUSB.c | 4 +++-
|
|
|
1dc13b |
src/wcmValidateDevice.c | 2 ++
|
|
|
1dc13b |
2 files changed, 5 insertions(+), 1 deletion(-)
|
|
|
1dc13b |
|
|
|
1dc13b |
diff --git a/src/wcmUSB.c b/src/wcmUSB.c
|
|
|
1dc13b |
index 295286a..0b5ec57 100644
|
|
|
1dc13b |
--- a/src/wcmUSB.c
|
|
|
1dc13b |
+++ b/src/wcmUSB.c
|
|
|
1dc13b |
@@ -91,7 +91,7 @@ DEFINE_MODEL(usbGraphire4, "USB Graphire4", 4);
|
|
|
1dc13b |
DEFINE_MODEL(usbBamboo, "USB Bamboo", 4);
|
|
|
1dc13b |
DEFINE_MODEL(usbBamboo1, "USB Bamboo1", 4);
|
|
|
1dc13b |
DEFINE_MODEL(usbBambooFun, "USB BambooFun", 4);
|
|
|
1dc13b |
-DEFINE_MODEL(usbCintiq, "USB PL/Cintiq", 4);
|
|
|
1dc13b |
+DEFINE_MODEL(usbCintiq, "USB PL/Cintiq/DTU", 4);
|
|
|
1dc13b |
DEFINE_MODEL(usbCintiqPartner, "USB CintiqPartner", 4);
|
|
|
1dc13b |
DEFINE_MODEL(usbIntuos, "USB Intuos1", 5);
|
|
|
1dc13b |
DEFINE_MODEL(usbIntuos2, "USB Intuos2", 5);
|
|
|
1dc13b |
@@ -232,6 +232,8 @@ static struct WacomModelDesc
|
|
|
1dc13b |
{ WACOM_VENDOR_ID, 0xC7, 100000, 100000, &usbCintiq, "DTU1931" },
|
|
|
1dc13b |
{ WACOM_VENDOR_ID, 0xCE, 100000, 100000, &usbCintiq, "DTU2231" },
|
|
|
1dc13b |
{ WACOM_VENDOR_ID, 0xF0, 100000, 100000, &usbCintiq, "DTU1631" },
|
|
|
1dc13b |
+ { WACOM_VENDOR_ID, 0x35a, 100000, 100000, &usbCintiq, "DTH1152" },
|
|
|
1dc13b |
+ { WACOM_VENDOR_ID, 0x368, 100000, 100000, &usbCintiq, "DTH1152" }, /* Touch */
|
|
|
1dc13b |
|
|
|
1dc13b |
{ WACOM_VENDOR_ID, 0x41, 100000, 100000, &usbIntuos2, "Intuos2 4x5" },
|
|
|
1dc13b |
{ WACOM_VENDOR_ID, 0x42, 100000, 100000, &usbIntuos2, "Intuos2 6x8" },
|
|
|
1dc13b |
diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
|
|
|
1dc13b |
index 0da5076..bfff8e7 100644
|
|
|
1dc13b |
--- a/src/wcmValidateDevice.c
|
|
|
1dc13b |
+++ b/src/wcmValidateDevice.c
|
|
|
1dc13b |
@@ -317,6 +317,8 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo)
|
|
|
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 |
+ case 0x368:/* DTH-1152 Touch */
|
|
|
1dc13b |
TabletSetFeature(priv->common, WCM_LCD);
|
|
|
1dc13b |
break;
|
|
|
1dc13b |
}
|
|
|
1dc13b |
--
|
|
|
1dc13b |
2.13.6
|
|
|
1dc13b |
|