From: Benjamin Tissoires <benjamin.tissoires@gmail.com>
To: "benjamin.tissoires" <benjamin.tissoires@gmail.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
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 03/10] HID: hid-multitouch: support arrays for the split of the touches in a report
Date: Thu, 25 Oct 2012 16:09:42 +0200 [thread overview]
Message-ID: <1351174189-24719-4-git-send-email-benjamin.tissoires@gmail.com> (raw)
In-Reply-To: <1351174189-24719-1-git-send-email-benjamin.tissoires@gmail.com>
Win8 certification introduced the ability to transmit two X and two Y per
touch. The specification precises that it must be in an array, with a
report count == 2.
This test guarantees that we split the touches on the last element
in this array.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
---
drivers/hid/hid-multitouch.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 1382554..e96ecc3 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -577,12 +577,16 @@ static int mt_event(struct hid_device *hid, struct hid_field *field,
return 0;
}
- if (usage->hid == td->last_slot_field)
- mt_complete_slot(td, field->hidinput->input);
-
- if (field->index == td->last_field_index
- && td->num_received >= td->num_expected)
- mt_sync_frame(td, field->hidinput->input);
+ if (usage_index + 1 == field->report_count) {
+ /* we only take into account the last report
+ * of a field if report_count > 1 */
+ if (usage->hid == td->last_slot_field)
+ mt_complete_slot(td, field->hidinput->input);
+
+ if (field->index == td->last_field_index
+ && td->num_received >= td->num_expected)
+ mt_sync_frame(td, field->hidinput->input);
+ }
}
--
1.7.11.7
next prev parent reply other threads:[~2012-10-25 14:09 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-25 14:09 [PATCH 0/10] Support for Win 8 digitizers Benjamin Tissoires
2012-10-25 14:09 ` [PATCH 01/10] HID: core: fix unit exponent parsing Benjamin Tissoires
2012-10-25 14:09 ` [PATCH 02/10] HID: hid-input: add usage_index argument in input_mapping and event Benjamin Tissoires
2012-10-25 14:09 ` Benjamin Tissoires [this message]
2012-10-25 14:09 ` [PATCH 04/10] HID: hid-multitouch: get maxcontacts also from logical_max value Benjamin Tissoires
2012-10-25 14:09 ` [PATCH 05/10] HID: hid-multitouch: support T and C for win8 devices Benjamin Tissoires
2012-10-25 14:09 ` [PATCH 06/10] HID: hid-multitouch: move ALWAYS_VALID quirk check Benjamin Tissoires
2012-10-25 14:09 ` [PATCH 07/10] HID: hid-multitouch: fix Win 8 protocol Benjamin Tissoires
2012-10-25 14:09 ` [PATCH 08/10] HID: hid-multitouch: support for hovering devices Benjamin Tissoires
2012-10-25 14:09 ` [PATCH 09/10] HID: introduce Scan Time Benjamin Tissoires
2012-10-25 14:09 ` [PATCH 10/10] HID: hid-multitouch: get rid of usbhid depedency for general path Benjamin Tissoires
2012-10-25 14:14 ` [PATCH 0/10] Support for Win 8 digitizers Benjamin Tissoires
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=1351174189-24719-4-git-send-email-benjamin.tissoires@gmail.com \
--to=benjamin.tissoires@gmail.com \
--cc=chatty@enac.fr \
--cc=dmitry.torokhov@gmail.com \
--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).