Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Input: HID - add support for Logitech Formula Force EX

Signed-off-by: Johann Deneux <johann.deneux@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

authored by

Valentin Zagura and committed by
Dmitry Torokhov
130b1ab3 0d98f6bb

+10 -3
+5 -1
drivers/usb/input/Kconfig
··· 58 58 devices. 59 59 60 60 config LOGITECH_FF 61 - bool "Logitech WingMan *3D support" 61 + bool "Logitech devices support" 62 62 depends on HID_FF 63 63 select INPUT_FF_MEMLESS if USB_HID 64 64 help 65 65 Say Y here if you have one of these devices: 66 66 - Logitech WingMan Cordless RumblePad 67 + - Logitech WingMan Cordless RumblePad 2 67 68 - Logitech WingMan Force 3D 69 + - Logitech Formula Force EX 70 + - Logitech MOMO Force wheel 71 + 68 72 and if you want to enable force feedback for them. 69 73 Note: if you say N here, this device will still be supported, but without 70 74 force feedback.
+3 -2
drivers/usb/input/hid-ff.c
··· 54 54 static struct hid_ff_initializer inits[] = { 55 55 #ifdef CONFIG_LOGITECH_FF 56 56 { 0x46d, 0xc211, hid_lgff_init }, /* Logitech Cordless rumble pad */ 57 - { 0x46d, 0xc283, hid_lgff_init }, /* Logitech Wingman Force 3d */ 58 - { 0x46d, 0xc295, hid_lgff_init }, /* Logitech MOMO force wheel */ 59 57 { 0x46d, 0xc219, hid_lgff_init }, /* Logitech Cordless rumble pad 2 */ 58 + { 0x46d, 0xc283, hid_lgff_init }, /* Logitech Wingman Force 3d */ 59 + { 0x46d, 0xc294, hid_lgff_init }, /* Logitech Formula Force EX */ 60 + { 0x46d, 0xc295, hid_lgff_init }, /* Logitech MOMO force wheel */ 60 61 { 0x46d, 0xca03, hid_lgff_init }, /* Logitech MOMO force wheel */ 61 62 #endif 62 63 #ifdef CONFIG_PANTHERLORD_FF
+2
drivers/usb/input/hid-lgff.c
··· 52 52 { 0x046d, 0xc211, ff_rumble }, 53 53 { 0x046d, 0xc219, ff_rumble }, 54 54 { 0x046d, 0xc283, ff_joystick }, 55 + { 0x046d, 0xc294, ff_joystick }, 56 + { 0x046d, 0xc295, ff_joystick }, 55 57 { 0x046d, 0xca03, ff_joystick }, 56 58 { 0x0000, 0x0000, ff_joystick } 57 59 };