Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee345492 authored by Sean O'Brien's avatar Sean O'Brien Committed by Jiri Kosina
Browse files

HID: add support for Apple Magic Keyboards 



USB device
	Vendor 05ac (Apple)
	Device 026c (Magic Keyboard with Numeric Keypad)

Bluetooth devices
	Vendor 004c (Apple)
	Device 0267 (Magic Keyboard)
	Device 026c (Magic Keyboard with Numeric Keypad)

Support already exists for the Magic Keyboard over USB connection.
Add support for the Magic Keyboard over Bluetooth connection, and for
the Magic Keyboard with Numeric Keypad over Bluetooth and USB
connection.

Signed-off-by: default avatarSean O'Brien <seobrien@chromium.org>
Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent fb6acf76

drivers/hid/hid-apple.c

+8 −1
Original line number Diff line number Diff line
@@ -335,7 +335,8 @@ static int apple_input_mapping(struct hid_device *hdev, struct hid_input *hi, 
		struct hid_field *field, struct hid_usage *usage,

		unsigned long **bit, int *max)

{

	if (usage->hid == (HID_UP_CUSTOM | 0x0003)) {

	if (usage->hid == (HID_UP_CUSTOM | 0x0003) ||

			usage->hid == (HID_UP_MSVENDOR | 0x0003)) {

		/* The fn key on Apple USB keyboards */

		set_bit(EV_REP, hi->input->evbit);

		hid_map_usage_clear(hi, usage, bit, max, EV_KEY, KEY_FN);
@@ -472,6 +473,12 @@ static const struct hid_device_id apple_devices[] = { 
		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO),

drivers/hid/hid-ids.h

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ 
#define USB_DEVICE_ID_ANTON_TOUCH_PAD	0x3101



#define USB_VENDOR_ID_APPLE		0x05ac

#define BT_VENDOR_ID_APPLE		0x004c

#define USB_DEVICE_ID_APPLE_MIGHTYMOUSE	0x0304

#define USB_DEVICE_ID_APPLE_MAGICMOUSE	0x030d

#define USB_DEVICE_ID_APPLE_MAGICTRACKPAD	0x030e
@@ -157,6 +158,7 @@ 
#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO   0x0256

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS   0x0257

#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI   0x0267

#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_ANSI   0x026c

#define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI	0x0290

#define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO	0x0291

#define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS	0x0292