From 130b1ab3f3dba350a949ae44a39c9beebddc09b9 Mon Sep 17 00:00:00 2001 From: Valentin Zagura Date: Sun, 18 Feb 2007 01:41:27 -0500 Subject: Input: HID - add support for Logitech Formula Force EX Signed-off-by: Johann Deneux Signed-off-by: Dmitry Torokhov --- drivers/usb/input/Kconfig | 6 +++++- drivers/usb/input/hid-ff.c | 3 ++- drivers/usb/input/hid-lgff.c | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'drivers/usb/input') diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig index 2e71d3cca19..69a9f3b6d0a 100644 --- a/drivers/usb/input/Kconfig +++ b/drivers/usb/input/Kconfig @@ -58,13 +58,17 @@ config HID_PID devices. config LOGITECH_FF - bool "Logitech WingMan *3D support" + bool "Logitech devices support" depends on HID_FF select INPUT_FF_MEMLESS if USB_HID help Say Y here if you have one of these devices: - Logitech WingMan Cordless RumblePad + - Logitech WingMan Cordless RumblePad 2 - Logitech WingMan Force 3D + - Logitech Formula Force EX + - Logitech MOMO Force wheel + and if you want to enable force feedback for them. Note: if you say N here, this device will still be supported, but without force feedback. diff --git a/drivers/usb/input/hid-ff.c b/drivers/usb/input/hid-ff.c index bc7f8e6f8c9..e431faaa6ab 100644 --- a/drivers/usb/input/hid-ff.c +++ b/drivers/usb/input/hid-ff.c @@ -54,9 +54,10 @@ struct hid_ff_initializer { static struct hid_ff_initializer inits[] = { #ifdef CONFIG_LOGITECH_FF { 0x46d, 0xc211, hid_lgff_init }, /* Logitech Cordless rumble pad */ + { 0x46d, 0xc219, hid_lgff_init }, /* Logitech Cordless rumble pad 2 */ { 0x46d, 0xc283, hid_lgff_init }, /* Logitech Wingman Force 3d */ + { 0x46d, 0xc294, hid_lgff_init }, /* Logitech Formula Force EX */ { 0x46d, 0xc295, hid_lgff_init }, /* Logitech MOMO force wheel */ - { 0x46d, 0xc219, hid_lgff_init }, /* Logitech Cordless rumble pad 2 */ { 0x46d, 0xca03, hid_lgff_init }, /* Logitech MOMO force wheel */ #endif #ifdef CONFIG_PANTHERLORD_FF diff --git a/drivers/usb/input/hid-lgff.c b/drivers/usb/input/hid-lgff.c index 4df0968f852..d1a4dffd30f 100644 --- a/drivers/usb/input/hid-lgff.c +++ b/drivers/usb/input/hid-lgff.c @@ -52,6 +52,8 @@ static const struct dev_type devices[] = { { 0x046d, 0xc211, ff_rumble }, { 0x046d, 0xc219, ff_rumble }, { 0x046d, 0xc283, ff_joystick }, + { 0x046d, 0xc294, ff_joystick }, + { 0x046d, 0xc295, ff_joystick }, { 0x046d, 0xca03, ff_joystick }, { 0x0000, 0x0000, ff_joystick } }; -- cgit From 00a8691ca689c134eaf5b73d7251df1d6f0318be Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Sun, 18 Feb 2007 01:42:11 -0500 Subject: Input: hid-lgff - treat devices as joysticks unless told otherwise By default threat devices as joysticks with constant force-feedback effect. Signed-off-by: Dmitry Torokhov --- drivers/usb/input/hid-lgff.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'drivers/usb/input') diff --git a/drivers/usb/input/hid-lgff.c b/drivers/usb/input/hid-lgff.c index d1a4dffd30f..e6f3af3e66d 100644 --- a/drivers/usb/input/hid-lgff.c +++ b/drivers/usb/input/hid-lgff.c @@ -55,7 +55,6 @@ static const struct dev_type devices[] = { { 0x046d, 0xc294, ff_joystick }, { 0x046d, 0xc295, ff_joystick }, { 0x046d, 0xca03, ff_joystick }, - { 0x0000, 0x0000, ff_joystick } }; static int hid_lgff_play(struct input_dev *dev, void *data, struct ff_effect *effect) @@ -107,8 +106,9 @@ int hid_lgff_init(struct hid_device* hid) struct input_dev *dev = hidinput->input; struct hid_report *report; struct hid_field *field; + const signed short *ff_bits = ff_joystick; int error; - int i, j; + int i; /* Find the report to use */ if (list_empty(report_list)) { @@ -132,12 +132,14 @@ int hid_lgff_init(struct hid_device* hid) for (i = 0; i < ARRAY_SIZE(devices); i++) { if (dev->id.vendor == devices[i].idVendor && dev->id.product == devices[i].idProduct) { - for (j = 0; devices[i].ff[j] >= 0; j++) - set_bit(devices[i].ff[j], dev->ffbit); + ff_bits = devices[i].ff; break; } } + for (i = 0; ff_bits[i] >= 0; i++) + set_bit(ff_bits[i], dev->ffbit); + error = input_ff_create_memless(dev, NULL, hid_lgff_play); if (error) return error; -- cgit