diff options
| author | Chris Bagwell <chris@cnpbagwell.com> | 2011-10-27 01:28:34 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-10-27 01:36:03 -0400 |
| commit | c5981411f60c31f0dff6f0f98d2d3711384badaf (patch) | |
| tree | fb25b24d1050276b1596ee8d5190a3a6e9268aed /drivers | |
| parent | 428f85884bb4a88737e5fa76535ede06a33fe162 (diff) | |
Input: wacom - relax Bamboo stylus ID check
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/tablet/wacom_wac.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index 7fefd93596ea..d1ced325939d 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c | |||
| @@ -842,12 +842,7 @@ static int wacom_bpt_pen(struct wacom_wac *wacom) | |||
| 842 | unsigned char *data = wacom->data; | 842 | unsigned char *data = wacom->data; |
| 843 | int prox = 0, x = 0, y = 0, p = 0, d = 0, pen = 0, btn1 = 0, btn2 = 0; | 843 | int prox = 0, x = 0, y = 0, p = 0, d = 0, pen = 0, btn1 = 0, btn2 = 0; |
| 844 | 844 | ||
| 845 | /* | 845 | prox = (data[1] & 0x20) == 0x20; |
| 846 | * Similar to Graphire protocol, data[1] & 0x20 is proximity and | ||
| 847 | * data[1] & 0x18 is tool ID. 0x30 is safety check to ignore | ||
| 848 | * 2 unused tool ID's. | ||
| 849 | */ | ||
| 850 | prox = (data[1] & 0x30) == 0x30; | ||
| 851 | 846 | ||
| 852 | /* | 847 | /* |
| 853 | * All reports shared between PEN and RUBBER tool must be | 848 | * All reports shared between PEN and RUBBER tool must be |