This brings ISDV4 2FGT in sync with USB GENERIC protocol so it goes with the same path as the USB _MT_ support.
Signed-off-by: Ping Cheng <[email protected]> --- src/wcmISDV4.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/wcmISDV4.c b/src/wcmISDV4.c index a0c9b3b..9b3beee 100644 --- a/src/wcmISDV4.c +++ b/src/wcmISDV4.c @@ -314,8 +314,8 @@ static int isdv4Query(InputInfoPtr pInfo, const char* query, char* data) static void isdv4InitISDV4(WacomCommonPtr common, const char* id, float version) { - /* set parameters */ - common->wcmProtocolLevel = WCM_PROTOCOL_4; + /* Change to generic protocol to match USB MT format */ + common->wcmProtocolLevel = WCM_PROTOCOL_GENERIC; /* length of a packet */ common->wcmPktLength = ISDV4_PKGLEN_TPCPEN; @@ -835,9 +835,9 @@ static int set_keybits_wacom(int id, unsigned long *keys) /* id < 0x008 are only penabled */ if (id > 0x007) - SETBIT(keys, BTN_TOOL_DOUBLETAP); + SETBIT(keys, BTN_TOOL_FINGER); if (id > 0x0a) - SETBIT(keys, BTN_TOOL_TRIPLETAP); + SETBIT(keys, BTN_TOOL_DOUBLETAP); /* no pen 2FGT */ if (id == 0x010) @@ -868,7 +868,6 @@ static int set_keybits_fujitsu(int id, unsigned long *keys) if (id == 0x2e7) { SETBIT(keys, BTN_TOOL_DOUBLETAP); - SETBIT(keys, BTN_TOOL_TRIPLETAP); tablet_id = 0xe3; } -- 1.7.3.5 ------------------------------------------------------------------------------ Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
