On 06/28/2011 10:07 PM, djkurtz@xxxxxxxxxxxx wrote:
> From: Daniel Kurtz <djkurtz@xxxxxxxxxxxx>
>
> Signed-off-by: Daniel Kurtz <djkurtz@xxxxxxxxxxxx>
I like the new name much better :).
Acked-by: Chase Douglas <chase.douglas@xxxxxxxxxxxxx>
> ---
> drivers/input/mouse/synaptics.c | 17 ++++++++++-------
> 1 files changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
> index 4e5e454..0a51b0ba 100644
> --- a/drivers/input/mouse/synaptics.c
> +++ b/drivers/input/mouse/synaptics.c
> @@ -489,7 +489,8 @@ static int synaptics_parse_hw_state(const unsigned char buf[],
> return 0;
> }
>
> -static void set_slot(struct input_dev *dev, int slot, bool active, int x, int y)
> +static void synaptics_report_semi_mt_slot(struct input_dev *dev, int slot,
> + bool active, int x, int y)
> {
> input_mt_slot(dev, slot);
> input_mt_report_slot_state(dev, MT_TOOL_FINGER, active);
> @@ -505,14 +506,16 @@ static void synaptics_report_semi_mt_data(struct input_dev *dev,
> int num_fingers)
> {
> if (num_fingers >= 2) {
> - set_slot(dev, 0, true, min(a->x, b->x), min(a->y, b->y));
> - set_slot(dev, 1, true, max(a->x, b->x), max(a->y, b->y));
> + synaptics_report_semi_mt_slot(dev, 0, true, min(a->x, b->x),
> + min(a->y, b->y));
> + synaptics_report_semi_mt_slot(dev, 1, true, max(a->x, b->x),
> + max(a->y, b->y));
> } else if (num_fingers == 1) {
> - set_slot(dev, 0, true, a->x, a->y);
> - set_slot(dev, 1, false, 0, 0);
> + synaptics_report_semi_mt_slot(dev, 0, true, a->x, a->y);
> + synaptics_report_semi_mt_slot(dev, 1, false, 0, 0);
> } else {
> - set_slot(dev, 0, false, 0, 0);
> - set_slot(dev, 1, false, 0, 0);
> + synaptics_report_semi_mt_slot(dev, 0, false, 0, 0);
> + synaptics_report_semi_mt_slot(dev, 1, false, 0, 0);
> }
> }
>
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
