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

Commit 7a84b133 authored by Ruben Aos Garralda's avatar Ruben Aos Garralda Committed by Jiri Kosina
Browse files

HID: add rumble support for Thrustmaster Dual Trigger 3-in-1 



This patch enables rumble in Thrustmaster Dual 3-in-1 trigger gamepads (in both
PC and PS3 modes).  It uses the same code as Thrustmaster FireStorm Dual Power 2,
so it only adds new USB IDs to hid-core.c and hid-tmff.c

Signed-off-by: default avatarRuben Aos Garralda <rubenatch@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 837b4753

drivers/hid/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -315,9 +315,9 @@ config THRUSTMASTER_FF 
	depends on HID_THRUSTMASTER

	select INPUT_FF_MEMLESS

	---help---

	  Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or

	  a THRUSTMASTER Ferrari GT Rumble Force or Force Feedback Wheel and

	  want to enable force feedback support for it.

	  Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or 3,

	  a THRUSTMASTER Dual Trigger 3-in-1 or a THRUSTMASTER Ferrari GT

	  Rumble Force or Force Feedback Wheel.



config HID_WACOM

	tristate "Wacom Bluetooth devices support" if EMBEDDED

drivers/hid/hid-core.c

+2 −0
Original line number Diff line number Diff line
@@ -1312,6 +1312,8 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb323) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb324) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb651) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) },

drivers/hid/hid-tmff.c

+5 −1
Original line number Diff line number Diff line
@@ -243,7 +243,11 @@ err: 
static const struct hid_device_id tm_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300),

		.driver_data = (unsigned long)ff_rumble },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304),

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304),   /* FireStorm Dual Power 2 (and 3) */

		.driver_data = (unsigned long)ff_rumble },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb323),   /* Dual Trigger 3-in-1 (PC Mode) */

		.driver_data = (unsigned long)ff_rumble },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb324),   /* Dual Trigger 3-in-1 (PS3 Mode) */

		.driver_data = (unsigned long)ff_rumble },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb651),	/* FGT Rumble Force Wheel */

		.driver_data = (unsigned long)ff_rumble },