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

Commit 89759e20 authored by Adam Jiang's avatar Adam Jiang Committed by Jiri Kosina
Browse files

HID: Add PID for Japanese version of NE4K keyboard 



This patche adds PID of Japanese Natual Ergonomic Keyboard 4000. HID
NE4K driver depends on this PID for determining its quirks. F14-F18 keys
would not work without the patch.

Signed-off-by: default avatarAdam Jiang <jiang.adam@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent d8565014

drivers/hid/hid-core.c

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

	{ 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_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
@@ -575,6 +575,7 @@ 
#define USB_DEVICE_ID_SIDEWINDER_GV	0x003b

#define USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0 0x009d

#define USB_DEVICE_ID_MS_NE4K		0x00db

#define USB_DEVICE_ID_MS_NE4K_JP	0x00dc

#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

drivers/hid/hid-microsoft.c

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

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K),

		.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_LK6K),

		.driver_data = MS_ERGONOMY | MS_RDESC },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB),