42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From: Chris Bagwell <chris@cnpbagwell.com>
|
|
Date: Wed, 26 Oct 2011 22:28:34 -0700
|
|
Subject: Input: wacom - relax Bamboo stylus ID check
|
|
|
|
commit c5981411f60c31f0dff6f0f98d2d3711384badaf upstream.
|
|
|
|
Bit 0x02 always means tip versus eraser. Bit 0x01 is something related
|
|
to version of stylus and different values are starting to be used.
|
|
|
|
Relaxing proximity check is required to be used with 3rd generation
|
|
Bamboo Pen and Touch tablets.
|
|
|
|
Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
|
|
Acked-by: Ping Cheng <pingc@wacom.com>
|
|
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
|
|
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
|
|
---
|
|
drivers/input/tablet/wacom_wac.c | 7 +------
|
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
|
|
index 2ee47d01a3b4..f00c70e1adb0 100644
|
|
--- a/drivers/input/tablet/wacom_wac.c
|
|
+++ b/drivers/input/tablet/wacom_wac.c
|
|
@@ -843,12 +843,7 @@ static int wacom_bpt_pen(struct wacom_wac *wacom)
|
|
unsigned char *data = wacom->data;
|
|
int prox = 0, x = 0, y = 0, p = 0, d = 0, pen = 0, btn1 = 0, btn2 = 0;
|
|
|
|
- /*
|
|
- * Similar to Graphire protocol, data[1] & 0x20 is proximity and
|
|
- * data[1] & 0x18 is tool ID. 0x30 is safety check to ignore
|
|
- * 2 unused tool ID's.
|
|
- */
|
|
- prox = (data[1] & 0x30) == 0x30;
|
|
+ prox = (data[1] & 0x20) == 0x20;
|
|
|
|
/*
|
|
* All reports shared between PEN and RUBBER tool must be
|
|
--
|
|
1.7.10.1
|
|
|