From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
To: Henrik Rydberg <rydberg@euromail.se>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Hans de Goede <hdegoede@redhat.com>
Cc: Peter Hutterer <peter.hutterer@who-t.net>,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [RFC 2/6] Input: mt: Document input_mt_set_slots()
Date: Mon, 19 Jan 2015 15:53:51 -0500 [thread overview]
Message-ID: <1421700835-22157-3-git-send-email-benjamin.tissoires@redhat.com> (raw)
In-Reply-To: <1421700835-22157-1-git-send-email-benjamin.tissoires@redhat.com>
Renamed "w" into "red_cost_matrix" for readability.
Add docs and comments to detail what the code is expected to do.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
drivers/input/input-mt.c | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/drivers/input/input-mt.c b/drivers/input/input-mt.c
index b6ee42a..b269113 100644
--- a/drivers/input/input-mt.c
+++ b/drivers/input/input-mt.c
@@ -359,23 +359,41 @@ static int input_mt_set_matrix(struct input_mt *mt,
return w - mt->red;
}
+/**
+ * input_mt_set_slots() - assign slots to the list of pos thanks to the reduced
+ * cost matrix
+ * @mt: the input_mt handle of the current device
+ * @slots: the slot assignment to be filled
+ * @num_pos: number of positions
+ *
+ * For each given touch in pos, try to match the touch to a previous one.
+ * Then, assign new slots to those who were not a match with the previously
+ * sent slots.
+ */
static void input_mt_set_slots(struct input_mt *mt,
int *slots, int num_pos)
{
struct input_mt_slot *s;
- int *w = mt->red, *p;
+ int *red_cost_matrix = mt->red;
+ int *p;
+ /* first initialise the output values to -1 */
for (p = slots; p != slots + num_pos; p++)
*p = -1;
+ /* for each currently active slot, match it with one of the touch
+ * in the pos array */
for (s = mt->slots; s != mt->slots + mt->num_slots; s++) {
if (!input_mt_is_active(s))
continue;
for (p = slots; p != slots + num_pos; p++)
- if (*w++ < 0)
+ if (*red_cost_matrix++ < 0)
+ /* we have a match, store the slot value
+ * in pos[i] */
*p = s - mt->slots;
}
+ /* for each unassigned touch in pos, assign a new slot for it */
for (s = mt->slots; s != mt->slots + mt->num_slots; s++) {
if (input_mt_is_active(s))
continue;
--
2.1.0
next prev parent reply other threads:[~2015-01-19 20:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-19 20:53 [RFC 0/6] Input: mt: Document in-kernel tracking and solve jumping cursors issues Benjamin Tissoires
2015-01-19 20:53 ` [RFC 1/6] Input: mt: make input_mt_assign_slots() a little bit more readable Benjamin Tissoires
2015-01-19 20:53 ` Benjamin Tissoires [this message]
2015-01-19 20:53 ` [RFC 3/6] Input: mt: document input_mt_set_matrix() Benjamin Tissoires
2015-01-19 20:53 ` [RFC 4/6] Input: mt: document find_reduced_matrix() Benjamin Tissoires
2015-01-19 20:53 ` [RFC 5/6] Input: mt: document adjust_dual() Benjamin Tissoires
2015-01-19 20:53 ` [RFC 6/6] Input: mt: introduce dmax in in-kernel tracking Benjamin Tissoires
2015-01-19 21:03 ` 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=1421700835-22157-3-git-send-email-benjamin.tissoires@redhat.com \
--to=benjamin.tissoires@redhat.com \
--cc=dmitry.torokhov@gmail.com \
--cc=hdegoede@redhat.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peter.hutterer@who-t.net \
--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).