diff options
| author | Jason Gerecke <killertofu@gmail.com> | 2019-05-24 14:51:32 -0700 |
|---|---|---|
| committer | Jason Gerecke <killertofu@gmail.com> | 2019-05-24 15:00:08 -0700 |
| commit | 365739656df5361533a57494db327ecbc7cb4b8a (patch) | |
| tree | 67befbe72e1b27d6d696e551909230fc60532040 | |
| parent | 3b30bb3dcd64d9467e5b5e2cbe014c11bd347317 (diff) | |
| download | xf86-input-wacom-365739656df5361533a57494db327ecbc7cb4b8a.tar.gz | |
USB: Apply WCM_PROTOCOL_GENERIC to non-Wacom hardware
It seems that some non-Wacom tablets have an ABS_MISC axis that makes
our driver try to apply special Wacom-only axis behaviors. This commit
makes the driver use WCM_PROTOCOL_GENERIC for any device that does not
have Wacom's VID.
Ref: https://github.com/linuxwacom/xf86-input-wacom/issues/52
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
| -rw-r--r-- | src/wcmUSB.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wcmUSB.c b/src/wcmUSB.c index 339f809..d0d28a8 100644 --- a/src/wcmUSB.c +++ b/src/wcmUSB.c @@ -793,8 +793,8 @@ int usbWcmGetRanges(InputInfoPtr pInfo) private->wcmPenTouch = TRUE; } - /* A generic protocol device does not report ABS_MISC event */ - if (!ISBITSET(abs, ABS_MISC)) + /* Non-wacom devices, and Wacom devices without an ABS_MISC should be treated as generic */ + if (common->vendor_id != WACOM_VENDOR_ID || !ISBITSET(abs, ABS_MISC)) common->wcmProtocolLevel = WCM_PROTOCOL_GENERIC; if (ioctl(pInfo->fd, EVIOCGBIT(EV_SW, sizeof(sw)), sw) < 0) |