Kernel input driver does not allow a specific tool type for pad
tool. We are forced to move all devices to PROTOCOL_GENERIC in
the kernel. Let's plan for the change so the code will cover all
affected devices instead of just Bamboos.

Signed-off-by: Ping Cheng <[email protected]>
---
 src/wcmUSB.c |   17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/wcmUSB.c b/src/wcmUSB.c
index 9305985..efd4319 100644
--- a/src/wcmUSB.c
+++ b/src/wcmUSB.c
@@ -518,18 +518,11 @@ int usbWcmGetRanges(InputInfoPtr pInfo)
        if (ioctl(pInfo->fd, EVIOCGABS(ABS_DISTANCE), &absinfo) == 0)
                common->wcmMaxDist = absinfo.maximum;
 
-
-       if ((common->tablet_id >= 0xd0) && (common->tablet_id <= 0xd3))
-       {
-               /* BTN_TOOL_DOUBLETAP means this is a touchpad and
-                * !BTN_TOOL_TRIPLETAP detects this is MT-version
-                * of touchpad; which uses generic protocol.
-                */
-               if (ISBITSET(common->wcmKeys, BTN_TOOL_DOUBLETAP) &&
-                   !ISBITSET(common->wcmKeys, BTN_TOOL_TRIPLETAP))
-                       common->wcmProtocolLevel = WCM_PROTOCOL_GENERIC;
-       }
-
+       /* Generic devices, which don't report pad data as a separate tool,
+        * do not send ABS_MISC event.
+        */
+       if (!ISBITSET (abs, ABS_MISC))
+               common->wcmProtocolLevel = WCM_PROTOCOL_GENERIC;
 
        return Success;
 }
-- 
1.7.2.3


------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to