summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPing Cheng <pinglinux@gmail.com>2013-09-10 16:42:22 -0700
committerPeter Hutterer <peter.hutterer@who-t.net>2013-09-11 13:15:46 +1000
commit59086ba4f5caf4cf6f52f80b5ca36144a882daa5 (patch)
tree73d79ca7501899464697a4d17e0d56b90bb50acb
parentcb14924a2a5be21c8525ca70932ab8b5f0f99752 (diff)
downloadxf86-input-wacom-59086ba4f5caf4cf6f52f80b5ca36144a882daa5.tar.gz
Add support for Intuos Pro series
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Ping Cheng <pingc@wacom.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/wcmUSB.c4
-rw-r--r--src/wcmValidateDevice.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/src/wcmUSB.c b/src/wcmUSB.c
index 068b306..eaaf854 100644
--- a/src/wcmUSB.c
+++ b/src/wcmUSB.c
@@ -97,6 +97,7 @@ DEFINE_MODEL(usbIntuos2, "USB Intuos2", 5);
DEFINE_MODEL(usbIntuos3, "USB Intuos3", 5);
DEFINE_MODEL(usbIntuos4, "USB Intuos4", 5);
DEFINE_MODEL(usbIntuos5, "USB Intuos5", 5);
+DEFINE_MODEL(usbIntuosPro, "USB Intuos Pro", 5);
DEFINE_MODEL(usbVolito, "USB Volito", 4);
DEFINE_MODEL(usbVolito2, "USB Volito2", 4);
DEFINE_MODEL(usbCintiqV5, "USB CintiqV5", 5);
@@ -270,6 +271,9 @@ static struct WacomModelDesc
{ WACOM_VENDOR_ID, 0x28, 200000, 200000, &usbIntuos5, "Intuos5 touch L" },
{ WACOM_VENDOR_ID, 0x29, 200000, 200000, &usbIntuos5, "Intuos5 S" },
{ WACOM_VENDOR_ID, 0x2A, 200000, 200000, &usbIntuos5, "Intuos5 M" },
+ { WACOM_VENDOR_ID, 0x314,200000, 200000, &usbIntuosPro, "Intuos Pro S" },
+ { WACOM_VENDOR_ID, 0x315,200000, 200000, &usbIntuosPro, "Intuos Pro M" },
+ { WACOM_VENDOR_ID, 0x317,200000, 200000, &usbIntuosPro, "Intuos Pro L" },
{ WACOM_VENDOR_ID, 0x3F, 200000, 200000, &usbCintiqV5, "Cintiq 21UX" },
{ WACOM_VENDOR_ID, 0xC5, 200000, 200000, &usbCintiqV5, "Cintiq 20WSX" },
diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
index b3c9c61..1a5e722 100644
--- a/src/wcmValidateDevice.c
+++ b/src/wcmValidateDevice.c
@@ -202,6 +202,9 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo)
TabletSetFeature(priv->common, WCM_DUALRING | WCM_LCD);
/* fall through */
+ case 0x314: /* Intuos Pro S */
+ case 0x315: /* Intuos Pro M */
+ case 0x317: /* Intuos Pro L */
case 0x26: /* I5 */
case 0x27: /* I5 */
case 0x28: /* I5 */