mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-07-18 05:36:57 +08:00
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
From 868d1a8a613bcae69bcbde7b42ced0ff97110d09 Mon Sep 17 00:00:00 2001
|
|
From: Janne Grunau <j@jannau.net>
|
|
Date: Thu, 16 Dec 2021 00:10:51 +0100
|
|
Subject: [PATCH 120/171] HID: magicmouse: use a define of the max number of
|
|
touch contacts
|
|
|
|
Signed-off-by: Janne Grunau <j@jannau.net>
|
|
---
|
|
drivers/hid/hid-magicmouse.c | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
|
|
index 664a624a363d..f4192e503b2c 100644
|
|
--- a/drivers/hid/hid-magicmouse.c
|
|
+++ b/drivers/hid/hid-magicmouse.c
|
|
@@ -61,6 +61,8 @@ MODULE_PARM_DESC(report_undeciphered, "Report undeciphered multi-touch state fie
|
|
#define DOUBLE_REPORT_ID 0xf7
|
|
#define USB_BATTERY_TIMEOUT_MS 60000
|
|
|
|
+#define MAX_CONTACTS 16
|
|
+
|
|
/* These definitions are not precise, but they're close enough. (Bits
|
|
* 0x03 seem to indicate the aspect ratio of the touch, bits 0x70 seem
|
|
* to be some kind of bit mask -- 0x20 may be a near-field reading,
|
|
@@ -139,8 +141,8 @@ struct magicmouse_sc {
|
|
u8 size;
|
|
bool scroll_x_active;
|
|
bool scroll_y_active;
|
|
- } touches[16];
|
|
- int tracking_ids[16];
|
|
+ } touches[MAX_CONTACTS];
|
|
+ int tracking_ids[MAX_CONTACTS];
|
|
|
|
struct hid_device *hdev;
|
|
struct delayed_work work;
|
|
@@ -592,7 +594,7 @@ static int magicmouse_setup_input(struct input_dev *input, struct hid_device *hd
|
|
|
|
__set_bit(EV_ABS, input->evbit);
|
|
|
|
- error = input_mt_init_slots(input, 16, mt_flags);
|
|
+ error = input_mt_init_slots(input, MAX_CONTACTS, mt_flags);
|
|
if (error)
|
|
return error;
|
|
input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0, 255 << 2,
|
|
--
|
|
2.34.1
|
|
|