| Message ID | 20190612140903.20058-1-timschumi@gmx.de (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 11518370b332c0eeaaccef1f5de7877747893f1f |
| Headers | show |
| Series | [resend] Input: iforce - Add the Saitek R440 Force Wheel | expand |
On Wed, Jun 12, 2019 at 04:09:03PM +0200, Tim Schumacher wrote: > Signed-off-by: Tim Schumacher <timschumi@gmx.de> Applied, thank you. > --- > Please note that I do NOT own this device. > > I'm adding this based on the fact that this is an iforce-based > device and that the Windows driver for the R440 works for the > Logitech WingMan Formula Force after replacing the device/vendor > IDs (I got the vendor/device IDs from there as well). > > Please don't add this patch if adding devices based on that is > not ok. > > This patch is a resend of the patch I sent back in November, > which apparently went unnoticed. > --- > drivers/input/joystick/iforce/iforce-main.c | 1 + > drivers/input/joystick/iforce/iforce-usb.c | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/drivers/input/joystick/iforce/iforce-main.c b/drivers/input/joystick/iforce/iforce-main.c > index 55f5b7bb4cac..e000e7d5b4c1 100644 > --- a/drivers/input/joystick/iforce/iforce-main.c > +++ b/drivers/input/joystick/iforce/iforce-main.c > @@ -55,6 +55,7 @@ static struct iforce_device iforce_device[] = { > { 0x05ef, 0x8888, "AVB Top Shot Force Feedback Racing Wheel", btn_wheel, abs_wheel, ff_iforce }, //? > { 0x061c, 0xc0a4, "ACT LABS Force RS", btn_wheel, abs_wheel, ff_iforce }, //? > { 0x061c, 0xc084, "ACT LABS Force RS", btn_wheel, abs_wheel, ff_iforce }, > + { 0x06a3, 0xff04, "Saitek R440 Force Wheel", btn_wheel, abs_wheel, ff_iforce }, //? > { 0x06f8, 0x0001, "Guillemot Race Leader Force Feedback", btn_wheel, abs_wheel, ff_iforce }, //? > { 0x06f8, 0x0001, "Guillemot Jet Leader Force Feedback", btn_joystick, abs_joystick_rudder, ff_iforce }, > { 0x06f8, 0x0004, "Guillemot Force Feedback Racing Wheel", btn_wheel, abs_wheel, ff_iforce }, //? > diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c > index f1569ae8381b..afbcd1a522d4 100644 > --- a/drivers/input/joystick/iforce/iforce-usb.c > +++ b/drivers/input/joystick/iforce/iforce-usb.c > @@ -202,6 +202,7 @@ static const struct usb_device_id iforce_usb_ids[] = { > { USB_DEVICE(0x05ef, 0x8888) }, /* AVB Top Shot FFB Racing Wheel */ > { USB_DEVICE(0x061c, 0xc0a4) }, /* ACT LABS Force RS */ > { USB_DEVICE(0x061c, 0xc084) }, /* ACT LABS Force RS */ > + { USB_DEVICE(0x06a3, 0xff04) }, /* Saitek R440 Force Wheel */ > { USB_DEVICE(0x06f8, 0x0001) }, /* Guillemot Race Leader Force Feedback */ > { USB_DEVICE(0x06f8, 0x0003) }, /* Guillemot Jet Leader Force Feedback */ > { USB_DEVICE(0x06f8, 0x0004) }, /* Guillemot Force Feedback Racing Wheel */ > -- > 2.22.0 >
diff --git a/drivers/input/joystick/iforce/iforce-main.c b/drivers/input/joystick/iforce/iforce-main.c index 55f5b7bb4cac..e000e7d5b4c1 100644 --- a/drivers/input/joystick/iforce/iforce-main.c +++ b/drivers/input/joystick/iforce/iforce-main.c @@ -55,6 +55,7 @@ static struct iforce_device iforce_device[] = { { 0x05ef, 0x8888, "AVB Top Shot Force Feedback Racing Wheel", btn_wheel, abs_wheel, ff_iforce }, //? { 0x061c, 0xc0a4, "ACT LABS Force RS", btn_wheel, abs_wheel, ff_iforce }, //? { 0x061c, 0xc084, "ACT LABS Force RS", btn_wheel, abs_wheel, ff_iforce }, + { 0x06a3, 0xff04, "Saitek R440 Force Wheel", btn_wheel, abs_wheel, ff_iforce }, //? { 0x06f8, 0x0001, "Guillemot Race Leader Force Feedback", btn_wheel, abs_wheel, ff_iforce }, //? { 0x06f8, 0x0001, "Guillemot Jet Leader Force Feedback", btn_joystick, abs_joystick_rudder, ff_iforce }, { 0x06f8, 0x0004, "Guillemot Force Feedback Racing Wheel", btn_wheel, abs_wheel, ff_iforce }, //? diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c index f1569ae8381b..afbcd1a522d4 100644 --- a/drivers/input/joystick/iforce/iforce-usb.c +++ b/drivers/input/joystick/iforce/iforce-usb.c @@ -202,6 +202,7 @@ static const struct usb_device_id iforce_usb_ids[] = { { USB_DEVICE(0x05ef, 0x8888) }, /* AVB Top Shot FFB Racing Wheel */ { USB_DEVICE(0x061c, 0xc0a4) }, /* ACT LABS Force RS */ { USB_DEVICE(0x061c, 0xc084) }, /* ACT LABS Force RS */ + { USB_DEVICE(0x06a3, 0xff04) }, /* Saitek R440 Force Wheel */ { USB_DEVICE(0x06f8, 0x0001) }, /* Guillemot Race Leader Force Feedback */ { USB_DEVICE(0x06f8, 0x0003) }, /* Guillemot Jet Leader Force Feedback */ { USB_DEVICE(0x06f8, 0x0004) }, /* Guillemot Force Feedback Racing Wheel */
Signed-off-by: Tim Schumacher <timschumi@gmx.de> --- Please note that I do NOT own this device. I'm adding this based on the fact that this is an iforce-based device and that the Windows driver for the R440 works for the Logitech WingMan Formula Force after replacing the device/vendor IDs (I got the vendor/device IDs from there as well). Please don't add this patch if adding devices based on that is not ok. This patch is a resend of the patch I sent back in November, which apparently went unnoticed. --- drivers/input/joystick/iforce/iforce-main.c | 1 + drivers/input/joystick/iforce/iforce-usb.c | 1 + 2 files changed, 2 insertions(+) -- 2.22.0