Skip to contentSkip to conversation

iforce: Add Gullemot Jet Leader Force Feedback

PATCH Applied Marek Vasut 3 participants 6 messages May 6, 2010 – May 11, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 iforce: Add Gullemot Jet Leader Force Feedback

Patch for this was in my repo since like 2.6.16 times. I never used the device much so the patch was always forgotten. This device features a RUDDER on the knob, so I had to add one more definition for that. The rest is just a USB ID addition.

---
 drivers/input/joystick/iforce/iforce-main.c |    4 ++++
 drivers/input/joystick/iforce/iforce-usb.c  |    1 +
 2 files changed, 5 insertions(+), 0 deletions(-)
drivers/input/joystick/iforce/iforce-main.c +4 -0
index b1edd77..987faea 100644
@@ -54,6 +54,9 @@ static signed short btn_avb_wheel[] =
 static signed short abs_joystick[] =
 { ABS_X, ABS_Y, ABS_THROTTLE, ABS_HAT0X, ABS_HAT0Y, -1 };
 
+static signed short abs_joystick_rudder[] =
+{ ABS_X, ABS_Y, ABS_THROTTLE, ABS_RUDDER, ABS_HAT0X, ABS_HAT0Y, -1 };
+
 static signed short abs_avb_pegasus[] =
 { ABS_X, ABS_Y, ABS_THROTTLE, ABS_RUDDER, ABS_HAT0X, ABS_HAT0Y,
   ABS_HAT1X, ABS_HAT1Y, -1 };
@@ -76,6 +79,7 @@ static struct iforce_device iforce_device[] = {
 	{ 0x061c, 0xc0a4, "ACT LABS Force RS",                          btn_wheel, abs_wheel, ff_iforce }, //?
 	{ 0x061c, 0xc084, "ACT LABS Force RS",				btn_wheel, abs_wheel, ff_iforce },
 	{ 0x06f8, 0x0001, "Guillemot Race Leader Force Feedback",	btn_wheel, abs_wheel, ff_iforce }, //?
+	{ 0x06f8, 0x0003, "Gullemot Jet Leader Force Feedback",		btn_joystick, abs_joystick_rudder, ff_iforce },
 	{ 0x06f8, 0x0004, "Guillemot Force Feedback Racing Wheel",	btn_wheel, abs_wheel, ff_iforce }, //?
 	{ 0x06f8, 0x0004, "Gullemot Jet Leader 3D",			btn_joystick, abs_joystick, ff_iforce }, //?
 	{ 0x06d6, 0x29bc, "Trust Force Feedback Race Master",		btn_wheel, abs_wheel, ff_iforce },
drivers/input/joystick/iforce/iforce-usb.c +1 -0
index b41303d..6c96631 100644
@@ -212,6 +212,7 @@ static struct usb_device_id iforce_usb_ids [] = {
 	{ USB_DEVICE(0x061c, 0xc0a4) },         /* ACT LABS Force RS */
 	{ USB_DEVICE(0x061c, 0xc084) },         /* ACT LABS Force RS */
 	{ 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 */
 	{ USB_DEVICE(0x06f8, 0xa302) },		/* Guillemot Jet Leader 3D */
 	{ }					/* Terminating entry */
Signature · 1 line
1.7.0
#1 lore raw

PATCH 2/2 iforce: Fix Gullemot Jet Leader 3D entry

USB ID entry for "Gullemot Jet Leader 3D" wasn't the same in iforce-main.c and iforce-usb.c . Fix this.

---
 drivers/input/joystick/iforce/iforce-main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/input/joystick/iforce/iforce-main.c +1 -1
index 987faea..fc88fb7 100644
@@ -81,7 +81,7 @@ static struct iforce_device iforce_device[] = {
 	{ 0x06f8, 0x0001, "Guillemot Race Leader Force Feedback",	btn_wheel, abs_wheel, ff_iforce }, //?
 	{ 0x06f8, 0x0003, "Gullemot Jet Leader Force Feedback",		btn_joystick, abs_joystick_rudder, ff_iforce },
 	{ 0x06f8, 0x0004, "Guillemot Force Feedback Racing Wheel",	btn_wheel, abs_wheel, ff_iforce }, //?
-	{ 0x06f8, 0x0004, "Gullemot Jet Leader 3D",			btn_joystick, abs_joystick, ff_iforce }, //?
+	{ 0x06f8, 0xa302, "Gullemot Jet Leader 3D",			btn_joystick, abs_joystick, ff_iforce }, //?
 	{ 0x06d6, 0x29bc, "Trust Force Feedback Race Master",		btn_wheel, abs_wheel, ff_iforce },
 	{ 0x0000, 0x0000, "Unknown I-Force Device [%04x:%04x]",		btn_joystick, abs_joystick, ff_iforce }
 };
Signature · 1 line
1.7.0
maintainer Applied
#2 lore raw

Re: [PATCH 2/2] iforce: Fix Gullemot Jet Leader 3D entry

Quoted 4 lines · Marek Vasut

USB ID entry for "Gullemot Jet Leader 3D" wasn't the same in iforce-main.c and iforce-usb.c . Fix this.

Applied both (changed Gullemont to Guillemont though). Thank you Marek.

Signature · 1 line
Dmitry
#3 lore raw

Re: [PATCH 2/2] iforce: Fix Gullemot Jet Leader 3D entry

Dne Út 11. května 2010 07:53:19 Dmitry Torokhov napsal(a):

Quoted 7 lines · Marek Vasut
Quoted 4 lines

USB ID entry for "Gullemot Jet Leader 3D" wasn't the same in iforce-main.c and iforce-usb.c . Fix this.

Applied both (changed Gullemont to Guillemont though). Thank you Marek.

Ah, lack of sleep. Thanks! :)
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#4 lore raw

Re: [PATCH 2/2] iforce: Fix Gullemot Jet Leader 3D entry

In reply to Dmitry Torokhov
Quoted 7 lines · Dmitry Torokhov
Quoted 4 lines · Marek Vasut

USB ID entry for "Gullemot Jet Leader 3D" wasn't the same in iforce-main.c and iforce-usb.c . Fix this.

Applied both (changed Gullemont to Guillemont though). Thank you Marek.

Huh, “Guillemot”:
http://www.joy-stick.net/reviews/joysticks/jetlead.htm

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

maintainer
#5 lore raw

Re: [PATCH 2/2] iforce: Fix Gullemot Jet Leader 3D entry

Quoted 11 lines · Bastien Nocera
Quoted 7 lines · Dmitry Torokhov
Quoted 4 lines · Marek Vasut

USB ID entry for "Gullemot Jet Leader 3D" wasn't the same in iforce-main.c and iforce-usb.c . Fix this.

Applied both (changed Gullemont to Guillemont though). Thank you Marek.

Huh, “Guillemot”:
http://www.joy-stick.net/reviews/joysticks/jetlead.htm

Right, thankfully the patch is correct, just my e-mail was messed up:

        { 0x06f8, 0x0001, "Guillemot Race Leader Force Feedback",
btn_wheel, abs_wheel, ff_iforce, true }, //?
        { 0x06f8, 0x0001, "Guillemot Jet Leader Force Feedback",
btn_joystick, abs_joystick_rudder, ff_iforce, true },
        { 0x06f8, 0x0004, "Guillemot Force Feedback Racing Wheel",
btn_wheel, abs_wheel, ff_iforce, true }, //?
        { 0x06f8, 0xa302, "Guillemot Jet Leader 3D",

btn_joystick, abs_joystick, ff_iforce, true }, //?

Signature · 5 lines
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html