aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2007-04-10 10:08:34 -0400
committerJiri Kosina <jkosina@suse.cz>2007-04-11 04:36:03 -0400
commit320c01500c6ecb189c577b921a2357c7a56aaebc (patch)
tree26e6e93a1b75e64accd36c85ff521e4164621105 /drivers/hid
parent713c8aad6b7202671ce1ac6109f6b48d8223e938 (diff)
USB HID: add FF support for Logitech Force 3D Pro Joystick
This patch adds support for Logitech Force 3D Pro Joystick (0x046d/0xc286) to hid-lgff driver. Device ID reported by Richard Bolkey <rbolkey@cs.utexas.edu> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/usbhid/hid-ff.c1
-rw-r--r--drivers/hid/usbhid/hid-lgff.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/usbhid/hid-ff.c b/drivers/hid/usbhid/hid-ff.c
index 4ff3edb9aa96..23431fbbc3d7 100644
--- a/drivers/hid/usbhid/hid-ff.c
+++ b/drivers/hid/usbhid/hid-ff.c
@@ -56,6 +56,7 @@ static struct hid_ff_initializer inits[] = {
56 { 0x46d, 0xc211, hid_lgff_init }, /* Logitech Cordless rumble pad */ 56 { 0x46d, 0xc211, hid_lgff_init }, /* Logitech Cordless rumble pad */
57 { 0x46d, 0xc219, hid_lgff_init }, /* Logitech Cordless rumble pad 2 */ 57 { 0x46d, 0xc219, hid_lgff_init }, /* Logitech Cordless rumble pad 2 */
58 { 0x46d, 0xc283, hid_lgff_init }, /* Logitech Wingman Force 3d */ 58 { 0x46d, 0xc283, hid_lgff_init }, /* Logitech Wingman Force 3d */
59 { 0x46d, 0xc286, hid_lgff_init }, /* Logitech Force 3D Pro Joystick */
59 { 0x46d, 0xc294, hid_lgff_init }, /* Logitech Formula Force EX */ 60 { 0x46d, 0xc294, hid_lgff_init }, /* Logitech Formula Force EX */
60 { 0x46d, 0xc295, hid_lgff_init }, /* Logitech MOMO force wheel */ 61 { 0x46d, 0xc295, hid_lgff_init }, /* Logitech MOMO force wheel */
61 { 0x46d, 0xca03, hid_lgff_init }, /* Logitech MOMO force wheel */ 62 { 0x46d, 0xca03, hid_lgff_init }, /* Logitech MOMO force wheel */
diff --git a/drivers/hid/usbhid/hid-lgff.c b/drivers/hid/usbhid/hid-lgff.c
index e6f3af3e66d1..92d2553f17b6 100644
--- a/drivers/hid/usbhid/hid-lgff.c
+++ b/drivers/hid/usbhid/hid-lgff.c
@@ -52,6 +52,7 @@ static const struct dev_type devices[] = {
52 { 0x046d, 0xc211, ff_rumble }, 52 { 0x046d, 0xc211, ff_rumble },
53 { 0x046d, 0xc219, ff_rumble }, 53 { 0x046d, 0xc219, ff_rumble },
54 { 0x046d, 0xc283, ff_joystick }, 54 { 0x046d, 0xc283, ff_joystick },
55 { 0x046d, 0xc286, ff_joystick },
55 { 0x046d, 0xc294, ff_joystick }, 56 { 0x046d, 0xc294, ff_joystick },
56 { 0x046d, 0xc295, ff_joystick }, 57 { 0x046d, 0xc295, ff_joystick },
57 { 0x046d, 0xca03, ff_joystick }, 58 { 0x046d, 0xca03, ff_joystick },