From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
To: Henrik Rydberg <rydberg@euromail.se>,
Jiri Kosina <jkosina@suse.cz>, Stephane Chatty <chatty@enac.fr>,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 4/7] HID: multitouch: change touch sensor detection in mt_input_configured()
Date: Fri, 22 Mar 2013 18:38:31 +0100 [thread overview]
Message-ID: <1363973914-5661-5-git-send-email-benjamin.tissoires@redhat.com> (raw)
In-Reply-To: <1363973914-5661-1-git-send-email-benjamin.tissoires@redhat.com>
To implement different methods for pen and touch, the previous
implementation has to be reworked.
This detection of the input attached to the touch sensor is the same
than the one used in mt_report().
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
drivers/hid/hid-multitouch.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 611c88cb..6a934de 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -857,13 +857,10 @@ static void mt_post_parse(struct mt_device *td)
static void mt_input_configured(struct hid_device *hdev, struct hid_input *hi)
{
- struct input_dev *input = hi->input;
-
- /* Only initialize slots for MT input devices */
- if (!test_bit(ABS_MT_POSITION_X, input->absbit))
- return;
+ struct mt_device *td = hid_get_drvdata(hdev);
- mt_touch_input_configured(hdev, hi);
+ if (hi->report->id == td->mt_report_id)
+ mt_touch_input_configured(hdev, hi);
}
static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
--
1.8.1.4
next prev parent reply other threads:[~2013-03-22 17:38 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-22 17:38 [PATCH v2 0/7] HID: multitouch: support of hybrid finger/pen devices Benjamin Tissoires
2013-03-22 17:38 ` [PATCH v2 1/7] HID: input: don't register unmapped input devices Benjamin Tissoires
2013-03-22 17:38 ` [PATCH v2 2/7] HID: multitouch: breaks out touch handling in specific functions Benjamin Tissoires
2013-03-22 17:38 ` [PATCH v2 3/7] HID: multitouch: do not map usage from non used reports Benjamin Tissoires
2013-03-22 17:38 ` Benjamin Tissoires [this message]
2013-03-22 17:38 ` [PATCH v2 5/7] HID: multitouch: add handling for pen in dual-sensors device Benjamin Tissoires
2013-03-22 17:38 ` [PATCH v2 6/7] HID: multitouch: append " Pen" to the name of the stylus input Benjamin Tissoires
2013-03-22 17:38 ` [PATCH v2 7/7] HID: multitouch: force BTN_STYLUS for pen devices Benjamin Tissoires
2013-03-27 13:04 ` [PATCH v2 0/7] HID: multitouch: support of hybrid finger/pen devices Jiri Kosina
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=1363973914-5661-5-git-send-email-benjamin.tissoires@redhat.com \
--to=benjamin.tissoires@redhat.com \
--cc=chatty@enac.fr \
--cc=jkosina@suse.cz \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rydberg@euromail.se \
/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).