Skip to content

Commit

Permalink
HID: magicmouse: Update device name for Apple Magic Trackpad
Browse files Browse the repository at this point in the history
Updated the device name for Apple Magic Trackpad USB-C when connected via
Bluetooth.

This change ensures the correct recognition of the 2024 USB-C trackpad and
improves user experience.

Signed-off-by: Qingyan Li <soragoto@soragoto.io>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
  • Loading branch information
你 言言 authored and Jiri Kosina committed Jan 9, 2025
1 parent 8ade5e0 commit 86b05bb
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions drivers/hid/hid-magicmouse.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ module_param(report_undeciphered, bool, 0644);
MODULE_PARM_DESC(report_undeciphered, "Report undeciphered multi-touch state field using a MSC_RAW event");

#define TRACKPAD2_2021_BT_VERSION 0x110
#define TRACKPAD_2024_BT_VERSION 0x314

#define TRACKPAD_REPORT_ID 0x28
#define TRACKPAD2_USB_REPORT_ID 0x02
Expand Down Expand Up @@ -567,9 +568,12 @@ static int magicmouse_setup_input(struct input_dev *input, struct hid_device *hd
*/
if (hdev->vendor == BT_VENDOR_ID_APPLE) {
if (input->id.version == TRACKPAD2_2021_BT_VERSION)
input->name = "Apple Inc. Magic Trackpad 2021";
else if (input->id.version == TRACKPAD_2024_BT_VERSION) {
input->name = "Apple Inc. Magic Trackpad USB-C";
} else {
input->name = "Apple Inc. Magic Trackpad";
else
input->name = "Apple Inc. Magic Trackpad 2";
}
} else { /* USB_VENDOR_ID_APPLE */
input->name = hdev->name;
}
Expand Down

0 comments on commit 86b05bb

Please sign in to comment.