Commit 1008230f authored by Ethan Warth's avatar Ethan Warth Committed by Jiri Kosina
Browse files

HID: mf: add support for 0079:1846 Mayflash/Dragonrise USB Gamecube Adapter 



Mayflash/Dragonrise seems to have yet another device ID for one of their
Gamecube controller adapters.  Previous to this commit, the adapter
registered only one /dev/input/js* device, and all controller inputs (from
any controller) were mapped to this device.  This patch defines the 1846
USB device ID and enables the HID_QUIRK_MULTI_INPUT quirk for it, which
fixes that (with the patch, four /dev/input/js* devices are created, one
for each of the four controller ports).

Signed-off-by: default avatarEthan Warth <redyoshi49q@gmail.com>
Tested-by: default avatarWladimir J. van der Laan <laanwj@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent ba876cdc

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ 
#define USB_DEVICE_ID_DRAGONRISE_DOLPHINBAR	0x1803

#define USB_DEVICE_ID_DRAGONRISE_GAMECUBE1	0x1843

#define USB_DEVICE_ID_DRAGONRISE_GAMECUBE2	0x1844

#define USB_DEVICE_ID_DRAGONRISE_GAMECUBE3	0x1846



#define USB_VENDOR_ID_DWAV		0x0eef

#define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER	0x0001

drivers/hid/hid-mf.c

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

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE2),

		.driver_data = 0 }, /* No quirk required */

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE3),

		.driver_data = HID_QUIRK_MULTI_INPUT },

	{ }

};

MODULE_DEVICE_TABLE(hid, mf_devices);

drivers/hid/hid-quirks.c

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ static const struct hid_device_id hid_quirks[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_REDRAGON_SEYMUR2), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_DOLPHINBAR), HID_QUIRK_MULTI_INPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE1), HID_QUIRK_MULTI_INPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE3), HID_QUIRK_MULTI_INPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3), HID_QUIRK_MULTI_INPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_WIIU), HID_QUIRK_MULTI_INPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER), HID_QUIRK_MULTI_INPUT | HID_QUIRK_NOGET },
@@ -484,6 +485,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_DOLPHINBAR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE3) },

#endif

#if IS_ENABLED(CONFIG_HID_MICROSOFT)

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500) },