From: Chris Bagwell <ch...@cnpbagwell.com>

A previous commit removed all bamboo ID's which caused it
to hit default statement removed in this patch and mistakenly
add WCM_PEN for Bamboo touchpad.

That flag only seems to be used by a debug statement so not
a big deal unless you want that information out of log file.

Change to generically set WCM_PEN feature based only on existence
of BTN_TOOL_PEN so all PEN enabled tablets will declare that
feature; which seems the conceptially correct thing to do
and has side affect of getting debug statement working for
Bamboo's again.

Signed-off-by: Chris Bagwell <ch...@cnpbagwell.com>
---
 src/wcmValidateDevice.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
index b4154c5..0c2a040 100644
--- a/src/wcmValidateDevice.c
+++ b/src/wcmValidateDevice.c
@@ -268,11 +268,11 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo)
                case 0x9F:
                        priv->common->tablet_type |= WCM_LCD;
                        break;
-
-               default:
-                       priv->common->tablet_type = WCM_PEN;
        }
 
+       if (ISBITSET(common->wcmKeys, BTN_TOOL_PEN))
+               priv->common->tablet_type |= WCM_PEN;
+
        if (ISBITSET (common->wcmKeys, BTN_0) ||
                        ISBITSET (common->wcmKeys, BTN_FORWARD))
        {
-- 
1.7.3.4


------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand 
malware threats, the impact they can have on your business, and how you 
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to