isdv4ProbeKeys is the place we set all tool types and other keys.
Reset the ProtocolLevel to PROTOCOL_GENERIC here as well.
Otherwise, it would be overwrote by the default.

Signed-off-by: Ping Cheng <pingli...@gmail.com>
---
 src/wcmISDV4.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/wcmISDV4.c b/src/wcmISDV4.c
index cc77a11..bfa0d0f 100644
--- a/src/wcmISDV4.c
+++ b/src/wcmISDV4.c
@@ -315,8 +315,6 @@ static int isdv4Query(InputInfoPtr pInfo, const char* 
query, char* data)
 
 static void isdv4InitISDV4(WacomCommonPtr common, const char* id, float 
version)
 {
-       /* Change to generic protocol to match USB MT format */
-       common->wcmProtocolLevel = WCM_PROTOCOL_GENERIC;
        /* length of a packet */
        common->wcmPktLength = ISDV4_PKGLEN_TPCPEN;
 
@@ -952,6 +950,9 @@ static int isdv4ProbeKeys(InputInfoPtr pInfo)
        if (model->set_bits)
                tablet_id = model->set_bits(id, common->wcmKeys);
 
+       /* Change to generic protocol to match USB MT format */
+       common->wcmProtocolLevel = WCM_PROTOCOL_GENERIC;
+
        return tablet_id;
 }
 
-- 
1.7.4


------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in 
Real-Time with Splunk. Collect, index and harness all the fast moving IT data 
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business 
insights. http://p.sf.net/sfu/splunk-dev2dev 
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to