Skip to content

Commit

Permalink
Input: wacom - relax Bamboo stylus ID check
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Chris Bagwell authored and Dmitry Torokhov committed Oct 27, 2011
1 parent 428f858 commit c598141
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions drivers/input/tablet/wacom_wac.c
Original file line number Diff line number Diff line change
Expand Up @@ -842,12 +842,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
Expand Down

0 comments on commit c598141

Please sign in to comment.