HID: hid-magicmouse: Correct touch orientation direction
The magic trackpad and mouse both report touch orientation in opposite direction to the bcm5974 driver and what is written in Documents/input/multi-touch-protocol.txt. This patch reverts the direction, so that all in-kernel devices with this feature behave the same way. Since no known application has been utilizing this information yet, it seems appropriate also for stable. Cc: stable@kernel.org Cc: Michael Poole <mdpoole@troilus.org> Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Acked-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
parent
d9236303d0
commit
2d9ca4e9f3
|
@ -258,7 +258,7 @@ static void magicmouse_emit_touch(struct magicmouse_sc *msc, int raw_id, u8 *tda
|
||||||
input_report_abs(input, ABS_MT_TRACKING_ID, id);
|
input_report_abs(input, ABS_MT_TRACKING_ID, id);
|
||||||
input_report_abs(input, ABS_MT_TOUCH_MAJOR, touch_major << 2);
|
input_report_abs(input, ABS_MT_TOUCH_MAJOR, touch_major << 2);
|
||||||
input_report_abs(input, ABS_MT_TOUCH_MINOR, touch_minor << 2);
|
input_report_abs(input, ABS_MT_TOUCH_MINOR, touch_minor << 2);
|
||||||
input_report_abs(input, ABS_MT_ORIENTATION, orientation);
|
input_report_abs(input, ABS_MT_ORIENTATION, -orientation);
|
||||||
input_report_abs(input, ABS_MT_POSITION_X, x);
|
input_report_abs(input, ABS_MT_POSITION_X, x);
|
||||||
input_report_abs(input, ABS_MT_POSITION_Y, y);
|
input_report_abs(input, ABS_MT_POSITION_Y, y);
|
||||||
|
|
||||||
|
@ -397,7 +397,7 @@ static void magicmouse_setup_input(struct input_dev *input, struct hid_device *h
|
||||||
input_set_abs_params(input, ABS_MT_TRACKING_ID, 0, 15, 0, 0);
|
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_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_MINOR, 0, 255, 4, 0);
|
||||||
input_set_abs_params(input, ABS_MT_ORIENTATION, -32, 31, 1, 0);
|
input_set_abs_params(input, ABS_MT_ORIENTATION, -31, 32, 1, 0);
|
||||||
|
|
||||||
/* Note: Touch Y position from the device is inverted relative
|
/* Note: Touch Y position from the device is inverted relative
|
||||||
* to how pointer motion is reported (and relative to how USB
|
* to how pointer motion is reported (and relative to how USB
|
||||||
|
|
Loading…
Reference in New Issue