From: "Henrik Rydberg" <rydberg@euromail.se>
To: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Jiri Kosina <jkosina@suse.cz>, Stephane Chatty <chatty@enac.fr>,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 09/13] HID: hid-multitouch: add MT_QUIRK_IGNORE_DUPLICATES
Date: Tue, 13 Nov 2012 17:25:31 +0100 [thread overview]
Message-ID: <20121113162531.GA669@polaris.bitmath.org> (raw)
In-Reply-To: <1352306256-12180-10-git-send-email-benjamin.tissoires@gmail.com>
Hi Benjamin,
> this prevents a device to reuse contact id 0 several time when
> sending garbage values to complete the report.
This quirk allows a device to reuse a contact id when sending garbage
inactive contacts at the end of a report.
>
> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
> ---
> drivers/hid/hid-multitouch.c | 6 ++++++
> include/linux/input/mt.h | 6 ++++++
> 2 files changed, 12 insertions(+)
>
> diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
> index 2352770..351c814 100644
> --- a/drivers/hid/hid-multitouch.c
> +++ b/drivers/hid/hid-multitouch.c
> @@ -52,6 +52,7 @@ MODULE_LICENSE("GPL");
> #define MT_QUIRK_VALID_IS_CONFIDENCE (1 << 6)
> #define MT_QUIRK_SLOT_IS_CONTACTID_MINUS_ONE (1 << 8)
> #define MT_QUIRK_NO_AREA (1 << 9)
> +#define MT_QUIRK_IGNORE_DUPLICATES (1 << 10)
>
> struct mt_slot {
> __s32 x, y, cx, cy, p, w, h;
> @@ -510,6 +511,11 @@ static void mt_complete_slot(struct mt_device *td, struct input_dev *input)
> if (slotnum < 0 || slotnum >= td->maxcontacts)
> return;
>
> + if (td->mtclass.quirks & MT_QUIRK_IGNORE_DUPLICATES &&
Don't like parenthesis, i see :-)
> + input_mt_is_active(&input->mt->slots[slotnum]) &&
> + input_mt_is_used(input->mt, &input->mt->slots[slotnum]))
> + return;
> +
It init_mt_slots failed earlier (no checks), input->mt can be NULL
here. Also, a local variable instead of repetition would be nice.
> input_mt_slot(input, slotnum);
> input_mt_report_slot_state(input, MT_TOOL_FINGER,
> s->touch_state);
> diff --git a/include/linux/input/mt.h b/include/linux/input/mt.h
> index cc5cca7..2e86bd0 100644
> --- a/include/linux/input/mt.h
> +++ b/include/linux/input/mt.h
> @@ -69,6 +69,12 @@ static inline bool input_mt_is_active(const struct input_mt_slot *slot)
> return input_mt_get_value(slot, ABS_MT_TRACKING_ID) >= 0;
> }
>
> +static inline bool input_mt_is_used(const struct input_mt *mt,
> + const struct input_mt_slot *slot)
> +{
> + return slot->frame == mt->frame;
> +}
> +
This is ok, although I would prefer to also change input-mt.c to use
this helper function. Possibly that turns this hunk into a separate patch.
> int input_mt_init_slots(struct input_dev *dev, unsigned int num_slots,
> unsigned int flags);
> void input_mt_destroy_slots(struct input_dev *dev);
> --
> 1.7.11.7
>
Thanks,
Henrik
next prev parent reply other threads:[~2012-11-13 16:19 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-07 16:37 [PATCH v3 00/13] Win 8 support for digitizers Benjamin Tissoires
2012-11-07 16:37 ` [PATCH v3 01/13] HID: hid-input: export hidinput_calc_abs_res Benjamin Tissoires
2012-11-13 7:45 ` Jiri Kosina
2012-11-07 16:37 ` [PATCH v3 02/13] HID: hid-input: round return value of hidinput_calc_abs_res Benjamin Tissoires
2012-11-13 7:44 ` Jiri Kosina
2012-11-07 16:37 ` [PATCH v3 03/13] HID: core: fix unit exponent parsing Benjamin Tissoires
2012-11-13 7:43 ` Jiri Kosina
2012-11-07 16:37 ` [PATCH v3 04/13] HID: hid-input: add usage_index in struct hid_usage Benjamin Tissoires
2012-11-13 7:44 ` Jiri Kosina
2012-11-13 15:38 ` Henrik Rydberg
2012-11-07 16:37 ` [PATCH v3 05/13] HID: hid-multitouch: support arrays for the split of the touches in a report Benjamin Tissoires
2012-11-13 15:44 ` Henrik Rydberg
2012-11-07 16:37 ` [PATCH v3 06/13] HID: hid-multitouch: get maxcontacts also from logical_max value Benjamin Tissoires
2012-11-07 16:37 ` [PATCH v3 07/13] HID: hid-multitouch: support T and C for win8 devices Benjamin Tissoires
2012-11-13 15:56 ` Henrik Rydberg
2012-11-07 16:37 ` [PATCH v3 08/13] HID: hid-multitouch: move ALWAYS_VALID quirk check Benjamin Tissoires
2012-11-13 15:57 ` Henrik Rydberg
2012-11-07 16:37 ` [PATCH v3 09/13] HID: hid-multitouch: add MT_QUIRK_IGNORE_DUPLICATES Benjamin Tissoires
2012-11-13 16:25 ` Henrik Rydberg [this message]
2012-11-07 16:37 ` [PATCH v3 10/13] HID: hid-multitouch: fix Win 8 protocol Benjamin Tissoires
2012-11-13 16:31 ` Henrik Rydberg
2012-11-07 16:37 ` [PATCH v3 11/13] HID: hid-multitouch: support for hovering devices Benjamin Tissoires
2012-11-13 16:42 ` Henrik Rydberg
2012-11-13 17:29 ` Benjamin Tissoires
2012-11-13 18:04 ` Henrik Rydberg
2012-11-13 18:08 ` Benjamin Tissoires
2012-11-13 18:55 ` Henrik Rydberg
2012-11-07 16:37 ` [PATCH v3 12/13] HID: introduce Scan Time Benjamin Tissoires
2012-11-09 8:45 ` Dmitry Torokhov
2012-11-13 14:25 ` Benjamin Tissoires
2012-11-13 17:15 ` Henrik Rydberg
2012-11-07 16:37 ` [PATCH v3 13/13] HID: hid-multitouch: forwards ABS_SCAN_TIME Benjamin Tissoires
2012-11-13 14:30 ` Benjamin Tissoires
2012-11-13 17:27 ` Henrik Rydberg
2012-11-13 17:45 ` Benjamin Tissoires
2012-11-13 18:28 ` Henrik Rydberg
2012-11-13 18:43 ` Henrik Rydberg
2012-11-13 7:47 ` [PATCH v3 00/13] Win 8 support for digitizers Jiri Kosina
2012-11-13 8:12 ` Benjamin Tissoires
2012-11-13 17:33 ` Henrik Rydberg
2012-11-13 17:52 ` 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=20121113162531.GA669@polaris.bitmath.org \
--to=rydberg@euromail.se \
--cc=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 \
/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).