* [PATCH] HID: magicmouse: Correct report range of major / minor axes
@ 2012-06-22 16:31 Yufeng Shen
2012-06-25 12:04 ` Henrik Rydberg
0 siblings, 1 reply; 3+ messages in thread
From: Yufeng Shen @ 2012-06-22 16:31 UTC (permalink / raw)
To: linux-input
Cc: Jiri Kosina, Henrik Rydberg, linux-kernel, Yufeng Shen,
Andrew de los Reyes
In patch "HID: magicmouse: Adjust major / minor axes to scale",
touch_major and touch_minor axes are scaled by a factor of
four when reported but the max touch_major/minor is not scaled
accordingly. This patch scales the max touch_major/minor to
be consistent with the reported value.
Signed-off-by: Yufeng Shen <miletus@chromium.org>
---
drivers/hid/hid-magicmouse.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
index 7cf3ffe..40ac665 100644
--- a/drivers/hid/hid-magicmouse.c
+++ b/drivers/hid/hid-magicmouse.c
@@ -426,8 +426,10 @@ static void magicmouse_setup_input(struct input_dev *input, struct hid_device *h
__set_bit(EV_ABS, input->evbit);
input_set_abs_params(input, ABS_MT_TRACKING_ID, 0, 15, 0, 0);
- input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0, 255, 4, 0);
- input_set_abs_params(input, ABS_MT_TOUCH_MINOR, 0, 255, 4, 0);
+ input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0, 255 << 2,
+ 4, 0);
+ input_set_abs_params(input, ABS_MT_TOUCH_MINOR, 0, 255 << 2,
+ 4, 0);
input_set_abs_params(input, ABS_MT_ORIENTATION, -31, 32, 1, 0);
/* Note: Touch Y position from the device is inverted relative
--
1.7.7.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] HID: magicmouse: Correct report range of major / minor axes
2012-06-22 16:31 [PATCH] HID: magicmouse: Correct report range of major / minor axes Yufeng Shen
@ 2012-06-25 12:04 ` Henrik Rydberg
2012-06-25 13:30 ` Jiri Kosina
0 siblings, 1 reply; 3+ messages in thread
From: Henrik Rydberg @ 2012-06-25 12:04 UTC (permalink / raw)
To: Yufeng Shen; +Cc: linux-input, Jiri Kosina, linux-kernel, Andrew de los Reyes
On Fri, Jun 22, 2012 at 12:31:53PM -0400, Yufeng Shen wrote:
> In patch "HID: magicmouse: Adjust major / minor axes to scale",
> touch_major and touch_minor axes are scaled by a factor of
> four when reported but the max touch_major/minor is not scaled
> accordingly. This patch scales the max touch_major/minor to
> be consistent with the reported value.
>
> Signed-off-by: Yufeng Shen <miletus@chromium.org>
> ---
> drivers/hid/hid-magicmouse.c | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
> index 7cf3ffe..40ac665 100644
> --- a/drivers/hid/hid-magicmouse.c
> +++ b/drivers/hid/hid-magicmouse.c
> @@ -426,8 +426,10 @@ static void magicmouse_setup_input(struct input_dev *input, struct hid_device *h
> __set_bit(EV_ABS, input->evbit);
>
> input_set_abs_params(input, ABS_MT_TRACKING_ID, 0, 15, 0, 0);
> - input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0, 255, 4, 0);
> - input_set_abs_params(input, ABS_MT_TOUCH_MINOR, 0, 255, 4, 0);
> + input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0, 255 << 2,
> + 4, 0);
> + input_set_abs_params(input, ABS_MT_TOUCH_MINOR, 0, 255 << 2,
> + 4, 0);
> input_set_abs_params(input, ABS_MT_ORIENTATION, -31, 32, 1, 0);
>
> /* Note: Touch Y position from the device is inverted relative
> --
> 1.7.7.3
>
Acked-by: Henrik Rydberg <rydberg@euromail.se>
Thanks,
Henrik
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] HID: magicmouse: Correct report range of major / minor axes
2012-06-25 12:04 ` Henrik Rydberg
@ 2012-06-25 13:30 ` Jiri Kosina
0 siblings, 0 replies; 3+ messages in thread
From: Jiri Kosina @ 2012-06-25 13:30 UTC (permalink / raw)
To: Henrik Rydberg
Cc: Yufeng Shen, linux-input, linux-kernel, Andrew de los Reyes
On Mon, 25 Jun 2012, Henrik Rydberg wrote:
> > In patch "HID: magicmouse: Adjust major / minor axes to scale",
> > touch_major and touch_minor axes are scaled by a factor of
> > four when reported but the max touch_major/minor is not scaled
> > accordingly. This patch scales the max touch_major/minor to
> > be consistent with the reported value.
> >
> > Signed-off-by: Yufeng Shen <miletus@chromium.org>
> > ---
> > drivers/hid/hid-magicmouse.c | 6 ++++--
> > 1 files changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
> > index 7cf3ffe..40ac665 100644
> > --- a/drivers/hid/hid-magicmouse.c
> > +++ b/drivers/hid/hid-magicmouse.c
> > @@ -426,8 +426,10 @@ static void magicmouse_setup_input(struct input_dev *input, struct hid_device *h
> > __set_bit(EV_ABS, input->evbit);
> >
> > input_set_abs_params(input, ABS_MT_TRACKING_ID, 0, 15, 0, 0);
> > - input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0, 255, 4, 0);
> > - input_set_abs_params(input, ABS_MT_TOUCH_MINOR, 0, 255, 4, 0);
> > + input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0, 255 << 2,
> > + 4, 0);
> > + input_set_abs_params(input, ABS_MT_TOUCH_MINOR, 0, 255 << 2,
> > + 4, 0);
> > input_set_abs_params(input, ABS_MT_ORIENTATION, -31, 32, 1, 0);
> >
> > /* Note: Touch Y position from the device is inverted relative
> > --
> > 1.7.7.3
> >
>
> Acked-by: Henrik Rydberg <rydberg@euromail.se>
Applied, thanks.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-06-25 13:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-22 16:31 [PATCH] HID: magicmouse: Correct report range of major / minor axes Yufeng Shen
2012-06-25 12:04 ` Henrik Rydberg
2012-06-25 13:30 ` Jiri Kosina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox