|
@@ -55,7 +55,6 @@ static const struct dev_type devices[] = {
|
|
{ 0x046d, 0xc294, ff_joystick },
|
|
{ 0x046d, 0xc294, ff_joystick },
|
|
{ 0x046d, 0xc295, ff_joystick },
|
|
{ 0x046d, 0xc295, ff_joystick },
|
|
{ 0x046d, 0xca03, 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)
|
|
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 input_dev *dev = hidinput->input;
|
|
struct hid_report *report;
|
|
struct hid_report *report;
|
|
struct hid_field *field;
|
|
struct hid_field *field;
|
|
|
|
+ const signed short *ff_bits = ff_joystick;
|
|
int error;
|
|
int error;
|
|
- int i, j;
|
|
|
|
|
|
+ int i;
|
|
|
|
|
|
/* Find the report to use */
|
|
/* Find the report to use */
|
|
if (list_empty(report_list)) {
|
|
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++) {
|
|
for (i = 0; i < ARRAY_SIZE(devices); i++) {
|
|
if (dev->id.vendor == devices[i].idVendor &&
|
|
if (dev->id.vendor == devices[i].idVendor &&
|
|
dev->id.product == devices[i].idProduct) {
|
|
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;
|
|
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);
|
|
error = input_ff_create_memless(dev, NULL, hid_lgff_play);
|
|
if (error)
|
|
if (error)
|
|
return error;
|
|
return error;
|