[Linuxwacom-devel] [PATCH v2] Support recent display devices on older kernels

[Aaron Armstrong Skomra]

Older kernels like 2.6.30 will end up with touches
interpreted as relative events unless these devices
are explicitly added.

Signed-off-by: Aaron Armstrong Skomra <***@wacom.com>
---
v2 add Touch PIDs to wcmUSB.c's device list

src/wcmUSB.c | 8 ++++++++
src/wcmValidateDevice.c | 8 ++++++++
2 files changed, 16 insertions(+)

diff --git a/src/wcmUSB.c b/src/wcmUSB.c
index 2f9d93f937d7..295286a3db3a 100644
--- a/src/wcmUSB.c
+++ b/src/wcmUSB.c
@@ -287,6 +287,14 @@ static struct WacomModelDesc
{ WACOM_VENDOR_ID, 0x57, 200000, 200000, &usbCintiqV5, "DTK2241" },
{ WACOM_VENDOR_ID, 0x59, 200000, 200000, &usbCintiqV5, "DTH2242" },
{ WACOM_VENDOR_ID, 0x5B, 200000, 200000, &usbCintiqV5, "Cintiq 22HDT" },
+ { WACOM_VENDOR_ID, 0x34A, 200000, 200000, &usbCintiqV5, "Mobilestudio Pro 13" }, /* Touch */
+ { WACOM_VENDOR_ID, 0x34B, 200000, 200000, &usbCintiqV5, "MobileStudio Pro 16" }, /* Touch */
+ { WACOM_VENDOR_ID, 0x34D, 200000, 200000, &usbCintiqV5, "MobileStudio Pro 13" },
+ { 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, 0x353, 200000, 200000, &usbCintiqV5, "Cintiq 13 FHD Pro" }, /* Touch */
+ { WACOM_VENDOR_ID, 0x354, 200000, 200000, &usbCintiqV5, "Cintiq 16 UHD Pro" }, /* 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 0b8387c3614c..d2a77238c729 100644
--- a/src/wcmValidateDevice.c
+++ b/src/wcmValidateDevice.c
@@ -309,6 +309,14 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo)
case 0x5D: /* DTH2242 Touch */
case 0x5E: /* Cintiq 22HDT Touch */
case 0x304:/* Cintiq 13HD */
+ case 0x34A:/* MobileStudio Pro 13 Touch */
+ case 0x34B:/* MobileStudio Pro 16 Touch */
+ case 0x34D:/* MobileStudio Pro 13 */
+ case 0x34E:/* MobileStudio Pro 13 */
+ case 0x34F:/* Cintiq Pro 13 FHD */
+ case 0x350:/* Cintiq Pro 16 UHD */
+ case 0x353:/* Cintiq Pro 13 FHD Touch */
+ case 0x354:/* Cintiq Pro 13 UHD Touch */
TabletSetFeature(priv->common, WCM_LCD);
break;
}

[Peter Hutterer]

Post by Aaron Armstrong Skomra
Older kernels like 2.6.30 will end up with touches
interpreted as relative events unless these devices
are explicitly added.

Reviewed-by: Peter Hutterer <***@who-t.net>, thanks!

Cheers,
Peter

Post by Aaron Armstrong Skomra
---
v2 add Touch PIDs to wcmUSB.c's device list
src/wcmUSB.c | 8 ++++++++
src/wcmValidateDevice.c | 8 ++++++++
2 files changed, 16 insertions(+)
diff --git a/src/wcmUSB.c b/src/wcmUSB.c
index 2f9d93f937d7..295286a3db3a 100644
--- a/src/wcmUSB.c
+++ b/src/wcmUSB.c
@@ -287,6 +287,14 @@ static struct WacomModelDesc
{ WACOM_VENDOR_ID, 0x57, 200000, 200000, &usbCintiqV5, "DTK2241" },
{ WACOM_VENDOR_ID, 0x59, 200000, 200000, &usbCintiqV5, "DTH2242" },
{ WACOM_VENDOR_ID, 0x5B, 200000, 200000, &usbCintiqV5, "Cintiq 22HDT" },
+ { WACOM_VENDOR_ID, 0x34A, 200000, 200000, &usbCintiqV5, "Mobilestudio Pro 13" }, /* Touch */
+ { WACOM_VENDOR_ID, 0x34B, 200000, 200000, &usbCintiqV5, "MobileStudio Pro 16" }, /* Touch */
+ { WACOM_VENDOR_ID, 0x34D, 200000, 200000, &usbCintiqV5, "MobileStudio Pro 13" },
+ { 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, 0x353, 200000, 200000, &usbCintiqV5, "Cintiq 13 FHD Pro" }, /* Touch */
+ { WACOM_VENDOR_ID, 0x354, 200000, 200000, &usbCintiqV5, "Cintiq 16 UHD Pro" }, /* 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 0b8387c3614c..d2a77238c729 100644
--- a/src/wcmValidateDevice.c
+++ b/src/wcmValidateDevice.c
@@ -309,6 +309,14 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo)
case 0x5D: /* DTH2242 Touch */
case 0x5E: /* Cintiq 22HDT Touch */
case 0x304:/* Cintiq 13HD */
+ case 0x34A:/* MobileStudio Pro 13 Touch */
+ case 0x34B:/* MobileStudio Pro 16 Touch */
+ case 0x34D:/* MobileStudio Pro 13 */
+ case 0x34E:/* MobileStudio Pro 13 */
+ case 0x34F:/* Cintiq Pro 13 FHD */
+ case 0x350:/* Cintiq Pro 16 UHD */
+ case 0x353:/* Cintiq Pro 13 FHD Touch */
+ case 0x354:/* Cintiq Pro 13 UHD Touch */
TabletSetFeature(priv->common, WCM_LCD);
break;
}
--
2.7.4
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Linuxwacom-devel mailing list
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel