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

Commit 5e7e9e90 authored by Alan Wu's avatar Alan Wu Committed by Jiri Kosina
Browse files

HID: microsoft: add support for Japanese Surface Type Cover 3 



Based on code for the US Surface Type Cover 3
from commit be3b1634
("HID: add support for MS Surface Pro 3 Type Cover"):

Signed-off-by: default avatarAlan Wu <alan.c.wu@gmail.com>
Tested-by: default avatarKarlis Dreizis <karlisdreizis@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 8e7b3410

drivers/hid/hid-core.c

+3 −1
Original line number Diff line number Diff line
@@ -704,7 +704,8 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type) 
		hid->group = HID_GROUP_SENSOR_HUB;



	if (hid->vendor == USB_VENDOR_ID_MICROSOFT &&

	    hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3 &&

	    (hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3 ||

	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3_JP) &&

	    hid->group == HID_GROUP_MULTITOUCH)

		hid->group = HID_GROUP_GENERIC;

}
@@ -1860,6 +1861,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_OFFICE_KB) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3_JP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -653,6 +653,7 @@ 
#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_3    0x07dc

#define USB_DEVICE_ID_MS_TYPE_COVER_3_JP 0x07dd



#define USB_VENDOR_ID_MOJO		0x8282

#define USB_DEVICE_ID_RETRO_ADAPTER	0x3201

drivers/hid/hid-microsoft.c

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

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3),

		.driver_data = MS_HIDINPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3_JP),

		.driver_data = MS_HIDINPUT },



	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT),

		.driver_data = MS_PRESENTER },

drivers/hid/usbhid/hid-quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3_JP, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_NEXIO, USB_DEVICE_ID_NEXIO_MULTITOUCH_PTI0750, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_NOVATEK, USB_DEVICE_ID_NOVATEK_MOUSE, HID_QUIRK_NO_INIT_REPORTS },