Skip to content

Commit

Permalink
USB: Apply WCM_PROTOCOL_GENERIC to non-Wacom hardware
Browse files Browse the repository at this point in the history
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: #52
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
  • Loading branch information
jigpu committed May 24, 2019
1 parent 3b30bb3 commit 3657396
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/wcmUSB.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 3657396

Please sign in to comment.