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

Commit f9a82c20 authored by Slava Bacherikov's avatar Slava Bacherikov Committed by Jiri Kosina
Browse files

HID: microsoft: Add ID for MS Wireless Comfort Keyboard 



Microsoft Wireless Comfort Keyboard has vendor specific My Favorites
1-5 keys. Linux already supports this buttons on other MS keyboards by
MS_ERGONOMY quirk. So apply MS_ERGONOMY quirk to USB PID 0x00e3
(Microsoft Wireless Optical Desktop Receiver 3.0A). After this
My Favorites 1..5 keys will be reported as KEY_F14..KEY_F15 events.

Signed-off-by: default avatarSlava Bacherikov <slava@bacher09.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent bfb61abf

drivers/hid/hid-core.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1919,6 +1919,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICOLCD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICOLCD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICOLCD_BOOTLOADER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICOLCD_BOOTLOADER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_KEYBOARD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K_JP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K_JP) },

drivers/hid/hid-ids.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -680,6 +680,7 @@ 
#define USB_DEVICE_ID_MS_NE7K		0x071d

#define USB_DEVICE_ID_MS_NE7K		0x071d

#define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K	0x0730

#define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K	0x0730

#define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500	0x076c

#define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500	0x076c

#define USB_DEVICE_ID_MS_COMFORT_KEYBOARD 0x00e3

#define USB_DEVICE_ID_MS_SURFACE_PRO_2   0x0799

#define USB_DEVICE_ID_MS_SURFACE_PRO_2   0x0799

#define USB_DEVICE_ID_MS_TOUCH_COVER_2   0x07a7

#define USB_DEVICE_ID_MS_TOUCH_COVER_2   0x07a7

#define USB_DEVICE_ID_MS_TYPE_COVER_2    0x07a9

#define USB_DEVICE_ID_MS_TYPE_COVER_2    0x07a9

drivers/hid/hid-microsoft.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -286,6 +286,8 @@ static const struct hid_device_id ms_devices[] = { 
		.driver_data = MS_HIDINPUT },

		.driver_data = MS_HIDINPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER),

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER),

		.driver_data = MS_HIDINPUT },

		.driver_data = MS_HIDINPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_KEYBOARD),

		.driver_data = MS_ERGONOMY},





	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT),

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT),

		.driver_data = MS_PRESENTER },

		.driver_data = MS_PRESENTER },