linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: chris@cnpbagwell.com
To: linux-input@vger.kernel.org, dmitry.torokhov@gmail.com,
	pinglinux@gmail.com
Cc: Chris Bagwell <chris@cnpbagwell.com>
Subject: [PATCH 4/6] Input: wacom - relax Bamboo stylus ID check
Date: Sun, 16 Oct 2011 20:29:39 -0500	[thread overview]
Message-ID: <1318814981-30607-5-git-send-email-chris@cnpbagwell.com> (raw)
In-Reply-To: <1318814981-30607-1-git-send-email-chris@cnpbagwell.com>

From: Chris Bagwell <chris@cnpbagwell.com>

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>
---
 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 7fefd93..d1ced32 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)
 	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.6.4


  parent reply	other threads:[~2011-10-17  1:29 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-17  1:29 [PATCH 0/6] Add support for new (3rd generation) Bamboo P&T's chris
2011-10-17  1:29 ` [PATCH 1/6] Input: wacom - cleanup feature report for bamboos chris
2011-10-17  1:29 ` [PATCH 2/6] Input: wacom - remove unused bamboo HID parsing chris
2011-10-20 21:17   ` Ping Cheng
2011-10-21 17:26     ` Chris Bagwell
2011-10-17  1:29 ` [PATCH 3/6] Input: wacom - add some comments to wacom_parse_hid chris
2011-10-17  1:29 ` chris [this message]
2011-10-17  1:29 ` [PATCH 5/6] Input: wacom - read 3rd gen Bamboo Touch HID data chris
2011-10-21  2:53   ` Dmitry Torokhov
2011-10-21 17:29     ` Chris Bagwell
2011-10-17  1:29 ` [PATCH 6/6] Input: wacom - 3rd gen Bamboo P&Touch packet support chris

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1318814981-30607-5-git-send-email-chris@cnpbagwell.com \
    --to=chris@cnpbagwell.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=linux-input@vger.kernel.org \
    --cc=pinglinux@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).