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

Commit 5906a044 authored by Tobias Mueller's avatar Tobias Mueller Committed by Jiri Kosina
Browse files

HID: add USB IDs for MacBook 3rd generation 



Add support for Macbook 3rd generation special mappings.

Signed-off-by: default avatarTobias Mueller <Tobias_Mueller@twam.info>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent be541ed1

drivers/hid/hid-input.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -97,6 +97,7 @@ struct hidinput_key_translation { 
#define APPLE_FLAG_FKEY 0x01

#define APPLE_FLAG_FKEY 0x01





static struct hidinput_key_translation apple_fn_keys[] = {

static struct hidinput_key_translation apple_fn_keys[] = {

	{ KEY_BACKSPACE, KEY_DELETE },

	{ KEY_F1,       KEY_BRIGHTNESSDOWN,     APPLE_FLAG_FKEY },

	{ KEY_F1,       KEY_BRIGHTNESSDOWN,     APPLE_FLAG_FKEY },

	{ KEY_F2,       KEY_BRIGHTNESSUP,       APPLE_FLAG_FKEY },

	{ KEY_F2,       KEY_BRIGHTNESSUP,       APPLE_FLAG_FKEY },

	{ KEY_F3,       KEY_CYCLEWINDOWS,       APPLE_FLAG_FKEY }, /* Exposé */

	{ KEY_F3,       KEY_CYCLEWINDOWS,       APPLE_FLAG_FKEY }, /* Exposé */
@@ -109,6 +110,10 @@ static struct hidinput_key_translation apple_fn_keys[] = { 
	{ KEY_F10,      KEY_MUTE,               APPLE_FLAG_FKEY },

	{ KEY_F10,      KEY_MUTE,               APPLE_FLAG_FKEY },

	{ KEY_F11,      KEY_VOLUMEDOWN,         APPLE_FLAG_FKEY },

	{ KEY_F11,      KEY_VOLUMEDOWN,         APPLE_FLAG_FKEY },

	{ KEY_F12,      KEY_VOLUMEUP,           APPLE_FLAG_FKEY },

	{ KEY_F12,      KEY_VOLUMEUP,           APPLE_FLAG_FKEY },

	{ KEY_UP,       KEY_PAGEUP },

	{ KEY_DOWN,     KEY_PAGEDOWN },

	{ KEY_LEFT,     KEY_HOME },

	{ KEY_RIGHT,    KEY_END },

	{ }

	{ }

};

};

drivers/hid/usbhid/hid-quirks.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -66,6 +66,12 @@ 
#define USB_DEVICE_ID_APPLE_ALU_ANSI	0x0220

#define USB_DEVICE_ID_APPLE_ALU_ANSI	0x0220

#define USB_DEVICE_ID_APPLE_ALU_ISO	0x0221

#define USB_DEVICE_ID_APPLE_ALU_ISO	0x0221

#define USB_DEVICE_ID_APPLE_ALU_JIS	0x0222

#define USB_DEVICE_ID_APPLE_ALU_JIS	0x0222

#define USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI    0x0229

#define USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO     0x022a

#define USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS     0x022b

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI  0x022c

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO   0x022d

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS   0x022e

#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY	0x030a

#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY	0x030a

#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY	0x030b

#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY	0x030b

#define USB_DEVICE_ID_APPLE_IRCONTROL4	0x8242

#define USB_DEVICE_ID_APPLE_IRCONTROL4	0x8242
@@ -617,6 +623,12 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI, HID_QUIRK_APPLE_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI, HID_QUIRK_APPLE_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS, HID_QUIRK_APPLE_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS, HID_QUIRK_APPLE_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_APPLE_ISO_KEYBOARD },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI, HID_QUIRK_APPLE_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS, HID_QUIRK_APPLE_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },