From: Jason Gerecke <killertofu@gmail.com>
To: linux-input@vger.kernel.org, dmitry.torokhov@gmail.com,
pinglinux@gmail.com, chris@cnpbagwell.com
Cc: Jason Gerecke <killertofu@gmail.com>
Subject: [PATCH 1/5] Input: wacom - Allow any multi-input Intuos device to set prox
Date: Thu, 6 Sep 2012 15:53:26 -0700 [thread overview]
Message-ID: <1346972010-1330-1-git-send-email-killertofu@gmail.com> (raw)
The ability to set the proximity flag should apply to any device
that has both pen and touch input. Rather than listing classes of
devices known to meet this criteria, simply filter on the quirk
defining all such devices.
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
---
drivers/input/tablet/wacom_wac.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index 532d067..a8bc6c9 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -326,7 +326,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom)
/* Enter report */
if ((data[1] & 0xfc) == 0xc0) {
- if (features->type >= INTUOS5S && features->type <= INTUOS5L)
+ if (features->quirks == WACOM_QUIRK_MULTI_INPUT)
wacom->shared->stylus_in_proximity = true;
/* serial number of the tool */
@@ -414,7 +414,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom)
/* Exit report */
if ((data[1] & 0xfe) == 0x80) {
- if (features->type >= INTUOS5S && features->type <= INTUOS5L)
+ if (features->quirks == WACOM_QUIRK_MULTI_INPUT)
wacom->shared->stylus_in_proximity = false;
/*
--
1.7.12
next reply other threads:[~2012-09-06 22:53 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-06 22:53 Jason Gerecke [this message]
2012-09-06 22:53 ` [PATCH 2/5] Input: wacom - handle split-sensor devices with internal hubs Jason Gerecke
2012-09-06 22:53 ` [PATCH 3/5] Input: wacom - Introduce wacom_fix_phy_from_hid Jason Gerecke
2012-09-06 22:53 ` [PATCH 4/5] Input: wacom - Clean up wacom_query_tablet_data Jason Gerecke
2012-09-06 22:53 ` [PATCH 5/5] Input: wacom - Add touch sensor support for Cintiq 24HD touch Jason Gerecke
2012-09-28 21:18 ` [PATCH 1/5] Input: wacom - Allow any multi-input Intuos device to set prox Ping Cheng
2012-10-01 17:09 ` Jason Gerecke
2012-10-04 7:25 ` Dmitry Torokhov
2012-10-05 22:26 ` Jason Gerecke
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=1346972010-1330-1-git-send-email-killertofu@gmail.com \
--to=killertofu@gmail.com \
--cc=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.