summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Gerecke <jason.gerecke@wacom.com>2019-12-16 13:01:39 -0800
committerGitHub <noreply@github.com>2019-12-16 13:01:39 -0800
commita3b03e8638c037132fdf0927c7e488ec80967a5c (patch)
treea7ce0ad9d92621fe8b952449f3d752924d350db5
parent3b338312eb275f2d9a602805931fa47d863a0209 (diff)
parenta2f52bd6b338031331fefe074d22b7ed19057341 (diff)
downloadxf86-input-wacom-a3b03e8638c037132fdf0927c7e488ec80967a5c.tar.gz
Merge pull request #96 from jigpu/add-new-msp-pid
Recognize new MobileStudio Pro PID Reviewed-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
-rw-r--r--src/wcmUSB.c2
-rw-r--r--src/wcmValidateDevice.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/wcmUSB.c b/src/wcmUSB.c
index bb9ea23..54cdd4b 100644
--- a/src/wcmUSB.c
+++ b/src/wcmUSB.c
@@ -314,6 +314,8 @@ static struct WacomModelDesc
{ WACOM_VENDOR_ID, 0x399, 200000, 200000, &usbCintiqV5, "MobileStudio Pro 16" },
{ WACOM_VENDOR_ID, 0x39A, 200000, 200000, &usbCintiqV5, "MobileStudio Pro 13" }, /* Touch */
{ WACOM_VENDOR_ID, 0x39B, 200000, 200000, &usbCintiqV5, "MobileStudio Pro 16" }, /* Touch */
+ { WACOM_VENDOR_ID, 0x3AA, 200000, 200000, &usbCintiqV5, "MobileStudio Pro 16" },
+ { WACOM_VENDOR_ID, 0x3AC, 200000, 200000, &usbCintiqV5, "MobileStudio Pro 16" }, /* Touch */
{ 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 6176139..133d601 100644
--- a/src/wcmValidateDevice.c
+++ b/src/wcmValidateDevice.c
@@ -206,6 +206,7 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo)
case 0x34E: /* MobileStudio Pro 16 */
case 0x398: /* MobileStudio Pro 13 */
case 0x399: /* MobileStudio Pro 16 */
+ case 0x3AA: /* MobileStudio Pro 16 */
TabletSetFeature(priv->common, WCM_LCD);
/* fall through */
@@ -359,6 +360,7 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo)
case 0x37E:/* DTH-2452 Touch */
case 0x39A:/* MobileStudio Pro 13 Touch */
case 0x39B:/* MobileStudio Pro 16 Touch */
+ case 0x3AC:/* MobileStudio Pro 16 Touch */
TabletSetFeature(priv->common, WCM_LCD);
break;
}