diff options
author | Jiri Kosina <jkosina@suse.cz> | 2009-06-23 06:11:31 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2009-07-22 19:28:00 -0400 |
commit | fd30ea8c871552ddd6a5e1c0886de8fef4df53bc (patch) | |
tree | f545921d04f47e5a848ae48c5ad6741ffca830a1 /drivers/hid | |
parent | 0810b51170570ed21cae56b8131db6a5e3efa584 (diff) |
HID: add force feedback support for Logitech WingMan Formula Force GP
Add force feedback support for Logitech WingMan Formula Force GP
(0x046d/0xc293).
Reported-by: wylda@volny.cz
Tested-by: wylda@volny.cz
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/Kconfig | 1 | ||||
-rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 1 | ||||
-rw-r--r-- | drivers/hid/hid-lg.c | 2 | ||||
-rw-r--r-- | drivers/hid/hid-lgff.c | 1 |
5 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 7831a0318d3c..d3910c64bf01 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig | |||
@@ -176,6 +176,7 @@ config LOGITECH_FF | |||
176 | - Logitech WingMan Cordless RumblePad 2 | 176 | - Logitech WingMan Cordless RumblePad 2 |
177 | - Logitech WingMan Force 3D | 177 | - Logitech WingMan Force 3D |
178 | - Logitech Formula Force EX | 178 | - Logitech Formula Force EX |
179 | - Logitech WingMan Formula Force GP | ||
179 | - Logitech MOMO Force wheel | 180 | - Logitech MOMO Force wheel |
180 | 181 | ||
181 | and if you want to enable force feedback for them. | 182 | and if you want to enable force feedback for them. |
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 5eb10c2ce665..d51091df5c1f 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1292,6 +1292,7 @@ static const struct hid_device_id hid_blacklist[] = { | |||
1292 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD) }, | 1292 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD) }, |
1293 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2_2) }, | 1293 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2_2) }, |
1294 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WINGMAN_F3D) }, | 1294 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WINGMAN_F3D) }, |
1295 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WINGMAN_FFG ) }, | ||
1295 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_FORCE3D_PRO) }, | 1296 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_FORCE3D_PRO) }, |
1296 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL) }, | 1297 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL) }, |
1297 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2) }, | 1298 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 630101037921..398f731fd699 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -296,6 +296,7 @@ | |||
296 | #define USB_DEVICE_ID_LOGITECH_WINGMAN_F3D 0xc283 | 296 | #define USB_DEVICE_ID_LOGITECH_WINGMAN_F3D 0xc283 |
297 | #define USB_DEVICE_ID_LOGITECH_FORCE3D_PRO 0xc286 | 297 | #define USB_DEVICE_ID_LOGITECH_FORCE3D_PRO 0xc286 |
298 | #define USB_DEVICE_ID_LOGITECH_WHEEL 0xc294 | 298 | #define USB_DEVICE_ID_LOGITECH_WHEEL 0xc294 |
299 | #define USB_DEVICE_ID_LOGITECH_WINGMAN_FFG 0xc293 | ||
299 | #define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL 0xc295 | 300 | #define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL 0xc295 |
300 | #define USB_DEVICE_ID_LOGITECH_G25_WHEEL 0xc299 | 301 | #define USB_DEVICE_ID_LOGITECH_G25_WHEEL 0xc299 |
301 | #define USB_DEVICE_ID_LOGITECH_ELITE_KBD 0xc30a | 302 | #define USB_DEVICE_ID_LOGITECH_ELITE_KBD 0xc30a |
diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c index 7afbaa0efd18..b30af30a0b17 100644 --- a/drivers/hid/hid-lg.c +++ b/drivers/hid/hid-lg.c | |||
@@ -299,6 +299,8 @@ static const struct hid_device_id lg_devices[] = { | |||
299 | .driver_data = LG_FF }, | 299 | .driver_data = LG_FF }, |
300 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL), | 300 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL), |
301 | .driver_data = LG_FF }, | 301 | .driver_data = LG_FF }, |
302 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WINGMAN_FFG ), | ||
303 | .driver_data = LG_FF }, | ||
302 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2), | 304 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2), |
303 | .driver_data = LG_FF2 }, | 305 | .driver_data = LG_FF2 }, |
304 | { } | 306 | { } |
diff --git a/drivers/hid/hid-lgff.c b/drivers/hid/hid-lgff.c index 56099709581c..95835ea5690f 100644 --- a/drivers/hid/hid-lgff.c +++ b/drivers/hid/hid-lgff.c | |||
@@ -67,6 +67,7 @@ static const struct dev_type devices[] = { | |||
67 | { 0x046d, 0xc219, ff_rumble }, | 67 | { 0x046d, 0xc219, ff_rumble }, |
68 | { 0x046d, 0xc283, ff_joystick }, | 68 | { 0x046d, 0xc283, ff_joystick }, |
69 | { 0x046d, 0xc286, ff_joystick_ac }, | 69 | { 0x046d, 0xc286, ff_joystick_ac }, |
70 | { 0x046d, 0xc293, ff_joystick }, | ||
70 | { 0x046d, 0xc294, ff_wheel }, | 71 | { 0x046d, 0xc294, ff_wheel }, |
71 | { 0x046d, 0xc295, ff_joystick }, | 72 | { 0x046d, 0xc295, ff_joystick }, |
72 | { 0x046d, 0xca03, ff_wheel }, | 73 | { 0x046d, 0xca03, ff_wheel }, |