* [PATCH 1/2] iforce: Add Gullemot Jet Leader Force Feedback
@ 2010-05-06 21:34 Marek Vasut
2010-05-06 21:34 ` [PATCH 2/2] iforce: Fix Gullemot Jet Leader 3D entry Marek Vasut
0 siblings, 1 reply; 6+ messages in thread
From: Marek Vasut @ 2010-05-06 21:34 UTC (permalink / raw)
To: linux-input; +Cc: dmitry.torokhov, dtor, Marek Vasut
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.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
drivers/input/joystick/iforce/iforce-main.c | 4 ++++
drivers/input/joystick/iforce/iforce-usb.c | 1 +
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/drivers/input/joystick/iforce/iforce-main.c b/drivers/input/joystick/iforce/iforce-main.c
index b1edd77..987faea 100644
--- a/drivers/input/joystick/iforce/iforce-main.c
+++ b/drivers/input/joystick/iforce/iforce-main.c
@@ -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 },
diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c
index b41303d..6c96631 100644
--- a/drivers/input/joystick/iforce/iforce-usb.c
+++ b/drivers/input/joystick/iforce/iforce-usb.c
@@ -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 */
--
1.7.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] iforce: Fix Gullemot Jet Leader 3D entry
2010-05-06 21:34 [PATCH 1/2] iforce: Add Gullemot Jet Leader Force Feedback Marek Vasut
@ 2010-05-06 21:34 ` Marek Vasut
2010-05-11 5:53 ` Dmitry Torokhov
0 siblings, 1 reply; 6+ messages in thread
From: Marek Vasut @ 2010-05-06 21:34 UTC (permalink / raw)
To: linux-input; +Cc: dmitry.torokhov, dtor, Marek Vasut
USB ID entry for "Gullemot Jet Leader 3D" wasn't the same in iforce-main.c and
iforce-usb.c . Fix this.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
drivers/input/joystick/iforce/iforce-main.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/input/joystick/iforce/iforce-main.c b/drivers/input/joystick/iforce/iforce-main.c
index 987faea..fc88fb7 100644
--- a/drivers/input/joystick/iforce/iforce-main.c
+++ b/drivers/input/joystick/iforce/iforce-main.c
@@ -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 }
};
--
1.7.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] iforce: Fix Gullemot Jet Leader 3D entry
2010-05-06 21:34 ` [PATCH 2/2] iforce: Fix Gullemot Jet Leader 3D entry Marek Vasut
@ 2010-05-11 5:53 ` Dmitry Torokhov
2010-05-11 6:25 ` Marek Vasut
2010-05-11 9:47 ` Bastien Nocera
0 siblings, 2 replies; 6+ messages in thread
From: Dmitry Torokhov @ 2010-05-11 5:53 UTC (permalink / raw)
To: Marek Vasut; +Cc: linux-input
On Thu, May 06, 2010 at 11:34:01PM +0200, Marek Vasut wrote:
> USB ID entry for "Gullemot Jet Leader 3D" wasn't the same in iforce-main.c and
> iforce-usb.c . Fix this.
>
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Applied both (changed Gullemont to Guillemont though). Thank you Marek.
--
Dmitry
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] iforce: Fix Gullemot Jet Leader 3D entry
2010-05-11 5:53 ` Dmitry Torokhov
@ 2010-05-11 6:25 ` Marek Vasut
2010-05-11 9:47 ` Bastien Nocera
1 sibling, 0 replies; 6+ messages in thread
From: Marek Vasut @ 2010-05-11 6:25 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: linux-input
Dne Út 11. května 2010 07:53:19 Dmitry Torokhov napsal(a):
> On Thu, May 06, 2010 at 11:34:01PM +0200, Marek Vasut wrote:
> > USB ID entry for "Gullemot Jet Leader 3D" wasn't the same in
> > iforce-main.c and iforce-usb.c . Fix this.
> >
> > Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
>
> 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 majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] iforce: Fix Gullemot Jet Leader 3D entry
2010-05-11 5:53 ` Dmitry Torokhov
2010-05-11 6:25 ` Marek Vasut
@ 2010-05-11 9:47 ` Bastien Nocera
2010-05-11 16:54 ` Dmitry Torokhov
1 sibling, 1 reply; 6+ messages in thread
From: Bastien Nocera @ 2010-05-11 9:47 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: Marek Vasut, linux-input
On Mon, 2010-05-10 at 22:53 -0700, Dmitry Torokhov wrote:
> On Thu, May 06, 2010 at 11:34:01PM +0200, Marek Vasut wrote:
> > USB ID entry for "Gullemot Jet Leader 3D" wasn't the same in iforce-main.c and
> > iforce-usb.c . Fix this.
> >
> > Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
>
> 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 majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] iforce: Fix Gullemot Jet Leader 3D entry
2010-05-11 9:47 ` Bastien Nocera
@ 2010-05-11 16:54 ` Dmitry Torokhov
0 siblings, 0 replies; 6+ messages in thread
From: Dmitry Torokhov @ 2010-05-11 16:54 UTC (permalink / raw)
To: Bastien Nocera; +Cc: Marek Vasut, linux-input
On Tue, May 11, 2010 at 10:47:45AM +0100, Bastien Nocera wrote:
> On Mon, 2010-05-10 at 22:53 -0700, Dmitry Torokhov wrote:
> > On Thu, May 06, 2010 at 11:34:01PM +0200, Marek Vasut wrote:
> > > USB ID entry for "Gullemot Jet Leader 3D" wasn't the same in iforce-main.c and
> > > iforce-usb.c . Fix this.
> > >
> > > Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> >
> > 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 }, //?
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-05-11 16:54 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-06 21:34 [PATCH 1/2] iforce: Add Gullemot Jet Leader Force Feedback Marek Vasut
2010-05-06 21:34 ` [PATCH 2/2] iforce: Fix Gullemot Jet Leader 3D entry Marek Vasut
2010-05-11 5:53 ` Dmitry Torokhov
2010-05-11 6:25 ` Marek Vasut
2010-05-11 9:47 ` Bastien Nocera
2010-05-11 16:54 ` Dmitry Torokhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).