BTN_TOOL_FINGER was borrowed to group PAD events. With the support of pen and touch on the same logical port, we can not use it any more.
PAD events of generic protocol has already manually routed to the pad channel, the last channel of wcmChanel. This patch groups PAD events for protocol 4 and 5 by the device_id sent through ABS_MISC event. In/out proximity event is also set by the ABS_MISC event. Signed-off-by: Ping Cheng <[email protected]> --- src/wcmUSB.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/wcmUSB.c b/src/wcmUSB.c index 4dec1a3..cfc3e26 100644 --- a/src/wcmUSB.c +++ b/src/wcmUSB.c @@ -966,8 +966,13 @@ static int usbParseAbsEvent(WacomCommonPtr common, ds->throttle = event->value; break; case ABS_MISC: + ds->proximity = (event->value != 0); if (event->value) + { ds->device_id = event->value; + if (ds->device_id == PAD_DEVICE_ID) + ds->device_type = PAD_ID; + } break; default: change = 0; -- 1.7.4 ------------------------------------------------------------------------------ Enable your software for Intel(R) Active Management Technology to meet the growing manageability and security demands of your customers. Businesses are taking advantage of Intel(R) vPro (TM) technology - will your software be a part of the solution? Download the Intel(R) Manageability Checker today! http://p.sf.net/sfu/intel-dev2devmar _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
