| Message ID | 1352908766-4492-11-git-send-email-benjamin.tissoires@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Nov 14, 2012 at 04:59:22PM +0100, Benjamin Tissoires wrote: > This patch extracts the test (slot->frame == mt->frame) so that it can > be used in third party drivers. > > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> > --- > drivers/input/input-mt.c | 2 +- > include/linux/input/mt.h | 6 ++++++ > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/input/input-mt.c b/drivers/input/input-mt.c > index c0ec7d4..475b9d4 100644 > --- a/drivers/input/input-mt.c > +++ b/drivers/input/input-mt.c > @@ -247,7 +247,7 @@ void input_mt_sync_frame(struct input_dev *dev) > > if (mt->flags & INPUT_MT_DROP_UNUSED) { > for (s = mt->slots; s != mt->slots + mt->num_slots; s++) { > - if (s->frame == mt->frame) > + if (input_mt_is_used(mt, s)) > continue; > input_mt_slot(dev, s - mt->slots); > input_event(dev, EV_ABS, ABS_MT_TRACKING_ID, -1); > 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; > +} > + > 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.8.0 > Reviewed-by: Henrik Rydberg <rydberg@euromail.se> Thanks, Henrik -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/input/input-mt.c b/drivers/input/input-mt.c index c0ec7d4..475b9d4 100644 --- a/drivers/input/input-mt.c +++ b/drivers/input/input-mt.c @@ -247,7 +247,7 @@ void input_mt_sync_frame(struct input_dev *dev) if (mt->flags & INPUT_MT_DROP_UNUSED) { for (s = mt->slots; s != mt->slots + mt->num_slots; s++) { - if (s->frame == mt->frame) + if (input_mt_is_used(mt, s)) continue; input_mt_slot(dev, s - mt->slots); input_event(dev, EV_ABS, ABS_MT_TRACKING_ID, -1); 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; +} + 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);
This patch extracts the test (slot->frame == mt->frame) so that it can be used in third party drivers. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> --- drivers/input/input-mt.c | 2 +- include/linux/input/mt.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)