summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Gerecke <killertofu@gmail.com>2017-10-27 15:46:19 -0700
committerJason Gerecke <killertofu@gmail.com>2018-01-04 15:21:35 -0800
commit6cb08771c882a22773a7b0caffff9d253ca65e70 (patch)
treed3b5fed0d14a14870fafad1bc58e2a3260c3a6f9
parent7b8e1150d599f0b4069f5c379bb162bf49b1d134 (diff)
downloadxf86-input-wacom-6cb08771c882a22773a7b0caffff9d253ca65e70.tar.gz
Add support for Cintiq Pro 24/32
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/wcmUSB.c5
-rw-r--r--src/wcmValidateDevice.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/src/wcmUSB.c b/src/wcmUSB.c
index 2f96a8a..45277c1 100644
--- a/src/wcmUSB.c
+++ b/src/wcmUSB.c
@@ -295,8 +295,13 @@ static struct WacomModelDesc
{ WACOM_VENDOR_ID, 0x34E, 200000, 200000, &usbCintiqV5, "MobileStudio Pro 16" },
{ WACOM_VENDOR_ID, 0x34F, 200000, 200000, &usbCintiqV5, "Cintiq 13 FHD Pro" },
{ WACOM_VENDOR_ID, 0x350, 200000, 200000, &usbCintiqV5, "Cintiq 16 UHD Pro" },
+ { WACOM_VENDOR_ID, 0x351, 200000, 200000, &usbCintiqV5, "Cintiq Pro 24" },
+ { WACOM_VENDOR_ID, 0x352, 200000, 200000, &usbCintiqV5, "Cintiq Pro 32" },
{ WACOM_VENDOR_ID, 0x353, 200000, 200000, &usbCintiqV5, "Cintiq 13 FHD Pro" }, /* Touch */
{ WACOM_VENDOR_ID, 0x354, 200000, 200000, &usbCintiqV5, "Cintiq 16 UHD Pro" }, /* Touch */
+ { WACOM_VENDOR_ID, 0x355, 200000, 200000, &usbCintiqV5, "Cintiq Pro 24" }, /* Touch */
+ { WACOM_VENDOR_ID, 0x356, 200000, 200000, &usbCintiqV5, "Cintiq Pro 32" }, /* Touch */
+ { WACOM_VENDOR_ID, 0x37C, 200000, 200000, &usbCintiqV5, "Cintiq Pro 24" }, /* Pen-only model */
{ WACOM_VENDOR_ID, 0x90, 100000, 100000, &usbTabletPC, "TabletPC 0x90" },
{ WACOM_VENDOR_ID, 0x93, 100000, 100000, &usbTabletPC, "TabletPC 0x93" },
diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
index 486235b..4640b79 100644
--- a/src/wcmValidateDevice.c
+++ b/src/wcmValidateDevice.c
@@ -313,6 +313,9 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo)
case 0x304:/* Cintiq 13HD */
case 0x34F:/* Cintiq Pro 13 FHD */
case 0x350:/* Cintiq Pro 16 UHD */
+ case 0x351:/* Cintiq Pro 24 */
+ case 0x352:/* Cintiq Pro 32 */
+ case 0x37C:/* Cintiq Pro 24 Pen-Only */
TabletSetFeature(priv->common, WCM_ROTATION);
/* fall-through */
@@ -325,6 +328,8 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo)
case 0x34B:/* MobileStudio Pro 16 Touch */
case 0x353:/* Cintiq Pro 13 FHD Touch */
case 0x354:/* Cintiq Pro 13 UHD Touch */
+ case 0x355:/* Cintiq Pro 24 Touch */
+ case 0x356:/* Cintiq Pro 32 Touch */
case 0x35A:/* DTH-1152*/
case 0x368:/* DTH-1152 Touch */
TabletSetFeature(priv->common, WCM_LCD);