On 2/16/07, Dmitry Torokhov <[EMAIL PROTECTED]> wrote:
On 2/16/07, johann deneux <[EMAIL PROTECTED]> wrote:
> On 2/15/07, Anssi Hannula <[EMAIL PROTECTED]> wrote:
> > Dmitry Torokhov wrote:
> > > On 2/15/07, STenyaK (Bruno Gonzalez) <[EMAIL PROTECTED]> wrote:
> > >> Sorry for not providing a proper patch, could you please also add
> > >> {0x46d, 0xc294, hid_lgff_init}, // Logitech G25 wheel
> > >> to the list? I tested it here and that wheel is also working.
> > >>
> > >
> > > OK.
> > >
> >
> > Hmm.. Shouldn't an entry also be added to the devices[] list in
> > hid-lgff.c for these devices? (and it seems one device is already
> > missing from there in the current kernel).
> >
> > I'm not able to check right now, but I think some earlier kernels may
> > have defaulted to ff_joystick if no entry is present in devices[], hence
> > these devices working for some without the entry.
> > (so the alternative is to restore that behaviour)
>
> Yes, defaulting to joystick was the way it was when I wrote hid-lgff.c, and
> I guess Valentin made his original patch on a kernel where defaulting was
> still there.
> I'll send a separate mail with the patch adding the devices there too, but I
> personally think defaulting was nice. Was there a reason behind the removal?
>
Simple oversight. I think we should restore defaulting.
Something like the attached should do I think...
--
Dmitry
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 <[EMAIL PROTECTED]>
---
drivers/usb/input/hid-lgff.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
Index: linux/drivers/usb/input/hid-lgff.c
===================================================================
--- linux.orig/drivers/usb/input/hid-lgff.c
+++ linux/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;
