mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-07-19 12:07:00 +08:00
49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
From 40b569fd3e7dc56dc7c32a0d86dd8675764a784e Mon Sep 17 00:00:00 2001
|
|
From: Janne Grunau <j@jannau.net>
|
|
Date: Thu, 16 Dec 2021 00:12:35 +0100
|
|
Subject: [PATCH 121/171] HID: magicmouse: use struct input_mt_pos for X/Y
|
|
|
|
Signed-off-by: Janne Grunau <j@jannau.net>
|
|
---
|
|
drivers/hid/hid-magicmouse.c | 9 ++++-----
|
|
1 file changed, 4 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
|
|
index f4192e503b2c..a02bdddb64b2 100644
|
|
--- a/drivers/hid/hid-magicmouse.c
|
|
+++ b/drivers/hid/hid-magicmouse.c
|
|
@@ -131,9 +131,8 @@ struct magicmouse_sc {
|
|
int scroll_accel;
|
|
unsigned long scroll_jiffies;
|
|
|
|
+ struct input_mt_pos pos[MAX_CONTACTS];
|
|
struct {
|
|
- short x;
|
|
- short y;
|
|
short scroll_x;
|
|
short scroll_y;
|
|
short scroll_x_hr;
|
|
@@ -190,7 +189,7 @@ static void magicmouse_emit_buttons(struct magicmouse_sc *msc, int state)
|
|
} else if (last_state != 0) {
|
|
state = last_state;
|
|
} else if ((id = magicmouse_firm_touch(msc)) >= 0) {
|
|
- int x = msc->touches[id].x;
|
|
+ int x = msc->pos[id].x;
|
|
if (x < middle_button_start)
|
|
state = 1;
|
|
else if (x > middle_button_stop)
|
|
@@ -251,8 +250,8 @@ static void magicmouse_emit_touch(struct magicmouse_sc *msc, int raw_id, u8 *tda
|
|
|
|
/* Store tracking ID and other fields. */
|
|
msc->tracking_ids[raw_id] = id;
|
|
- msc->touches[id].x = x;
|
|
- msc->touches[id].y = y;
|
|
+ msc->pos[id].x = x;
|
|
+ msc->pos[id].y = y;
|
|
msc->touches[id].size = size;
|
|
|
|
/* If requested, emulate a scroll wheel by detecting small
|
|
--
|
|
2.34.1
|
|
|