* [PATCHv3] Adding rumble support to Thrustmaster Dual Trigger 3-in-1
@ 2009-06-29 7:33 Rubén Aós Garralda <rubenatch@gmail.com>
2009-06-29 7:43 ` Jiri Kosina
0 siblings, 1 reply; 2+ messages in thread
From: Rubén Aós Garralda <rubenatch@gmail.com> @ 2009-06-29 7:33 UTC (permalink / raw)
To: jkosina; +Cc: linux-kernel
[-- Attachment #1: Type: TEXT/PLAIN, Size: 2976 bytes --]
From: Rubén Aós Garralda <rubenatch@gmail.com>
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: Rubén Aós Garralda <rubenatch@gmail.com>
---
Hope it is OK this time...
diff -uprN linux-source-2.6.30/drivers/hid/hid-core.c linux-source-test/drivers/hid/hid-core.c
--- linux-source-2.6.30/drivers/hid/hid-core.c 2009-06-10 05:05:27.000000000 +0200
+++ linux-source-test/drivers/hid/hid-core.c 2009-06-26 15:33:48.000000000 +0200
@@ -1309,6 +1309,8 @@ static const struct hid_device_id hid_bl
{ 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) },
diff -uprN linux-source-2.6.30/drivers/hid/hid-tmff.c linux-source-test/drivers/hid/hid-tmff.c
--- linux-source-2.6.30/drivers/hid/hid-tmff.c 2009-06-10 05:05:27.000000000 +0200
+++ linux-source-test/drivers/hid/hid-tmff.c 2009-06-26 15:35:27.000000000 +0200
@@ -236,7 +236,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 },
diff -uprN linux-source-2.6.30/drivers/hid/Kconfig linux-source-test/drivers/hid/Kconfig
--- linux-source-2.6.30/drivers/hid/Kconfig 2009-06-10 05:05:27.000000000 +0200
+++ linux-source-test/drivers/hid/Kconfig 2009-06-26 15:58:15.000000000 +0200
@@ -268,8 +268,9 @@ config THRUSTMASTER_FF
depends on USB_HID
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.
+ Say Y here if you have a THRUSTMASTER FireStorm Dual Power 2 or 3,
+ a THRUSTMASTER Dual Trigger 3-in-1 or a THRUSTMASTER Ferrari GT
+ Rumble Force or Force Feedback Wheel.
config ZEROPLUS_FF
tristate "Zeroplus based game controller support"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCHv3] Adding rumble support to Thrustmaster Dual Trigger 3-in-1
2009-06-29 7:33 [PATCHv3] Adding rumble support to Thrustmaster Dual Trigger 3-in-1 Rubén Aós Garralda <rubenatch@gmail.com>
@ 2009-06-29 7:43 ` Jiri Kosina
0 siblings, 0 replies; 2+ messages in thread
From: Jiri Kosina @ 2009-06-29 7:43 UTC (permalink / raw)
To: Rubén Aós Garralda <rubenatch@gmail.com>; +Cc: linux-kernel
[-- Attachment #1: Type: TEXT/PLAIN, Size: 451 bytes --]
On Mon, 29 Jun 2009, Rubén Aós Garralda <rubenatch@gmail.com> wrote:
> From: Rubén Aós Garralda <rubenatch@gmail.com>
>
> 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: Rubén Aós Garralda <rubenatch@gmail.com>
Applied, thanks!
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-06-29 7:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-06-29 7:33 [PATCHv3] Adding rumble support to Thrustmaster Dual Trigger 3-in-1 Rubén Aós Garralda <rubenatch@gmail.com>
2009-06-29 7:43 ` Jiri Kosina
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.