aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb/input
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-19 13:31:34 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-19 13:31:34 -0800
commitd43a338e395371733a80ec473b40baac5f74d768 (patch)
treed4c01b62865bed1af2463d7a4eb4cb25ca46c66e /drivers/usb/input
parentcb4aaf46c0283dd79ab2e8b8b165c0bf13ab6194 (diff)
parent62b529a7b9c11880a8820494a25db0e2ecdf3bed (diff)
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input: Input: remove obsolete setup parameters from input drivers Input: HIL - fix improper call to release_region() Input: hid-lgff - treat devices as joysticks unless told otherwise Input: HID - add support for Logitech Formula Force EX Input: gpio-keys - switch to common GPIO API Input: do not lock device when showing name, phys and uniq Input: i8042 - let serio bus suspend ports Input: psmouse - properly reset mouse on shutdown/suspend
Diffstat (limited to 'drivers/usb/input')
-rw-r--r--drivers/usb/input/Kconfig6
-rw-r--r--drivers/usb/input/hid-ff.c3
-rw-r--r--drivers/usb/input/hid-lgff.c12
3 files changed, 15 insertions, 6 deletions
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..e6f3af3e66d 100644
--- a/drivers/usb/input/hid-lgff.c
+++ b/drivers/usb/input/hid-lgff.c
@@ -52,8 +52,9 @@ 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 }
};
static int hid_lgff_play(struct input_dev *dev, void *data, struct ff_effect *effect)
@@ -105,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)) {
@@ -130,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;