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

Commit ef567cf9 authored by Jakub Sitnicki's avatar Jakub Sitnicki Committed by Jiri Kosina
Browse files

HID: microsoft: Add ID for NE7K wireless keyboard 

Microsoft Natural Wireless Ergonomic Keyboard 7000 has special My
Favorites 1..5 keys which are handled through a vendor-defined usage
page (0xff05).

Apply MS_ERGONOMY quirks handling to USB PID 0x071d (Microsoft Microsoft
2.4GHz Transceiver V1.0) so that the My Favorites 1..5 keys are reported
as KEY_F14..18 events.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=52841


Signed-off-by: default avatarJakub Sitnicki <jsitnicki@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 6d00f37e

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1872,6 +1872,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ 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_JP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE7K) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) },

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -654,6 +654,7 @@ 
#define USB_DEVICE_ID_MS_LK6K		0x00f9

#define USB_DEVICE_ID_MS_PRESENTER_8K_BT	0x0701

#define USB_DEVICE_ID_MS_PRESENTER_8K_USB	0x0713

#define USB_DEVICE_ID_MS_NE7K		0x071d

#define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K	0x0730

#define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500	0x076c

#define USB_DEVICE_ID_MS_SURFACE_PRO_2   0x0799

drivers/hid/hid-microsoft.c

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

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K_JP),

		.driver_data = MS_ERGONOMY },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE7K),

		.driver_data = MS_ERGONOMY },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K),

		.driver_data = MS_ERGONOMY | MS_RDESC },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB),