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

Commit 5d922baa authored by Joshua V. Dillon's avatar Joshua V. Dillon Committed by Jiri Kosina
Browse files

HID: add support for MacBookAir4,2 keyboard. 



Added USB device IDs for MacBookAir4,2 keyboard. Device constants were
copied from the MacBookAir3,2 constants. The 4,2 device specification is
reportedly unchanged from the 3,2 predecessor and seems to work well.

Signed-off-by: default avatarJoshua V Dillon <jvdillon@gmail.com>
Signed-off-by: default avatarChase Douglas <chase.douglas@canonical.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 45dc1ac7

drivers/hid/hid-apple.c

+9 −0
Original line number Diff line number Diff line
@@ -183,6 +183,9 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, 
		if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI &&

				hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS)

			table = macbookair_fn_keys;

		else if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI &&

				hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING6_JIS)

			table = macbookair_fn_keys;

		else if (hid->product < 0x21d || hid->product >= 0x300)

			table = powerbook_fn_keys;

		else
@@ -487,6 +490,12 @@ static const struct hid_device_id apple_devices[] = { 
		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS),

		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ISO),

		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_JIS),

		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),

drivers/hid/hid-ids.h

+3 −0
Original line number Diff line number Diff line
@@ -109,6 +109,9 @@ 
#define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI	0x0245

#define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO	0x0246

#define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS	0x0247

#define USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI	0x024c

#define USB_DEVICE_ID_APPLE_WELLSPRING6_ISO	0x024d

#define USB_DEVICE_ID_APPLE_WELLSPRING6_JIS	0x024e

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI  0x0239

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO   0x023a

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS   0x023b