[PATCH] Input: iforce - Remove empty multiline comments
Those are remnants of the SPDX identifier migration, which haven't been
removed properly.
Signed-off-by: Tim Schumacher
---
This is probably the highest level of cosmetic-only that a patch
can achieve, sorry for the noise.
CCing Thomas Gleixner, since the tool (is it a tool?) that makes
those SPDX changes would have room for improvement in that regard.
It seems to expect that all of the license information is contained
within the same comment block, which wasn't the case for the iforce
driver.
---
drivers/input/joystick/iforce/iforce-ff.c | 3 ---
drivers/input/joystick/iforce/iforce-main.c| 3 ---
drivers/input/joystick/iforce/iforce-packets.c | 3 ---
drivers/input/joystick/iforce/iforce-serio.c | 3 ---
drivers/input/joystick/iforce/iforce-usb.c | 3 ---
drivers/input/joystick/iforce/iforce.h | 3 ---
6 files changed, 18 deletions(-)
diff --git a/drivers/input/joystick/iforce/iforce-ff.c
b/drivers/input/joystick/iforce/iforce-ff.c
index 2ed7da7d1f3e..4350927f7781 100644
--- a/drivers/input/joystick/iforce/iforce-ff.c
+++ b/drivers/input/joystick/iforce/iforce-ff.c
@@ -6,9 +6,6 @@
* USB/RS232 I-Force joysticks and wheels.
*/
-/*
- */
-
#include "iforce.h"
/*
diff --git a/drivers/input/joystick/iforce/iforce-main.c
b/drivers/input/joystick/iforce/iforce-main.c
index 55f5b7bb4cac..8c2ffa43ce89 100644
--- a/drivers/input/joystick/iforce/iforce-main.c
+++ b/drivers/input/joystick/iforce/iforce-main.c
@@ -6,9 +6,6 @@
* USB/RS232 I-Force joysticks and wheels.
*/
-/*
- */
-
#include "iforce.h"
MODULE_AUTHOR("Vojtech Pavlik , Johann Deneux
");
diff --git a/drivers/input/joystick/iforce/iforce-packets.c
b/drivers/input/joystick/iforce/iforce-packets.c
index 42cd9730e4cc..677a7773059d 100644
--- a/drivers/input/joystick/iforce/iforce-packets.c
+++ b/drivers/input/joystick/iforce/iforce-packets.c
@@ -6,9 +6,6 @@
* USB/RS232 I-Force joysticks and wheels.
*/
-/*
- */
-
#include "iforce.h"
static struct {
diff --git a/drivers/input/joystick/iforce/iforce-serio.c
b/drivers/input/joystick/iforce/iforce-serio.c
index 65a4fe26324f..b3fff64d92dd 100644
--- a/drivers/input/joystick/iforce/iforce-serio.c
+++ b/drivers/input/joystick/iforce/iforce-serio.c
@@ -6,9 +6,6 @@
* USB/RS232 I-Force joysticks and wheels.
*/
-/*
- */
-
#include "iforce.h"
void iforce_serial_xmit(struct iforce *iforce)
diff --git a/drivers/input/joystick/iforce/iforce-usb.c
b/drivers/input/joystick/iforce/iforce-usb.c
index f1569ae8381b..ec5058e05317 100644
--- a/drivers/input/joystick/iforce/iforce-usb.c
+++ b/drivers/input/joystick/iforce/iforce-usb.c
@@ -6,9 +6,6 @@
* USB/RS232 I-Force joysticks and wheels.
*/
-/*
- */
-
#include "iforce.h"
void iforce_usb_xmit(struct iforce *iforce)
diff --git a/drivers/input/joystick/iforce/iforce.h
b/drivers/input/joystick/iforce/iforce.h
index f1681706f526..32e91baf63f5 100644
--- a/drivers/input/joystick/iforce/iforce.h
+++ b/drivers/input/joystick/iforce/iforce.h
@@ -6,9 +6,6 @@
* USB/RS232 I-Force joysticks and wheels.
*/
-/*
- */
-
#include
#include
#include
--
2.22.0
Re: [PATCH 01/20] Input: iforce - remove "being used" silliness
On 19.09.18 19:10, Dmitry Torokhov wrote: > On Wed, Sep 19, 2018 at 04:51:26PM +0200, Tim Schumacher wrote: >> On 18.09.18 02:47, Dmitry Torokhov wrote: >>> The kernel is supposed to handle multiple devices, static flags >>> in packet handling code will never work. >>> >>> Signed-off-by: Dmitry Torokhov >>> --- >>> >>> This is a random assortment of iforce patches that I made a few weeks back. >>> >>> Tim, I do not have hardware, so I was bound to screw it up, but if you >>> have some time I'd appreciate if you try them out (and if I indeed broke >>> things if you could identify issues that would be even more awesome). >>> >>> Thanks! >>> >> Hello Dmitry, >> >> I tested those patches and I didn't find any obvious issues. The basic >> functions >> do work (i.e. buttons and axes, don't have a HAT so I can't test that), force >> feedback seems to work to the extent it was before (I only have fftest >> though, >> no games that support force feedback). I'll go through a few more >> applications >> and see if anything not obvious is broken. >> > > Thank you for taking a look. > >> Unfortunately, I only have that one wheel and I can only test USB connections >> at the moment (unless I find a proper serial adaptor, but I'm not sure if >> that >> would even work). >> >> Are those patches planned to go into 4.19 or are they intended to be merged >> in >> the next development cycle? > > Definitely not 4.19. Could be 4.20 or 4.21... > > Thanks. > Hello Dmitry, as a followup to the last E-Mail I sent about this topic, the complete chain of patches has been in my personal tree since September of 2018 and there have been no issues so far as well. I tested a few more games and utilities, and I was able to test with multiple wheels simultaneously as well. In the end it's still your decision, but imo those patches should be fine to pull in. Tim
[PATCH resend] Input: iforce - Add the Saitek R440 Force Wheel
Signed-off-by: Tim Schumacher
---
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, 0x, "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, 0x) }, /* 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
[PATCH] Input: iforce - Add the Saitek R440 Force Wheel
Signed-off-by: Tim Schumacher
---
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.
Also (not related to this patch specifically), does anyone know
what the question marks at the end of some device definitions
are supposed to mean?
---
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 58d5cfe46526..432deecaeff9 100644
--- a/drivers/input/joystick/iforce/iforce-main.c
+++ b/drivers/input/joystick/iforce/iforce-main.c
@@ -67,6 +67,7 @@ static struct iforce_device iforce_device[] = {
{ 0x05ef, 0x, "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 78073259c9a1..cdea61ae838d 100644
--- a/drivers/input/joystick/iforce/iforce-usb.c
+++ b/drivers/input/joystick/iforce/iforce-usb.c
@@ -214,6 +214,7 @@ static const struct usb_device_id iforce_usb_ids[] = {
{ USB_DEVICE(0x05ef, 0x) }, /* 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.19.1.450.ga4b8ab536
[PATCH] Input: iforce - Add the Saitek R440 Force Wheel
Signed-off-by: Tim Schumacher
---
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.
Also (not related to this patch specifically), does anyone know
what the question marks at the end of some device definitions
are supposed to mean?
---
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 58d5cfe46526..432deecaeff9 100644
--- a/drivers/input/joystick/iforce/iforce-main.c
+++ b/drivers/input/joystick/iforce/iforce-main.c
@@ -67,6 +67,7 @@ static struct iforce_device iforce_device[] = {
{ 0x05ef, 0x, "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 78073259c9a1..cdea61ae838d 100644
--- a/drivers/input/joystick/iforce/iforce-usb.c
+++ b/drivers/input/joystick/iforce/iforce-usb.c
@@ -214,6 +214,7 @@ static const struct usb_device_id iforce_usb_ids[] = {
{ USB_DEVICE(0x05ef, 0x) }, /* 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.19.1.450.ga4b8ab536
Re: [PATCH 01/20] Input: iforce - remove "being used" silliness
On 18.09.18 02:47, Dmitry Torokhov wrote: The kernel is supposed to handle multiple devices, static flags in packet handling code will never work. Signed-off-by: Dmitry Torokhov --- This is a random assortment of iforce patches that I made a few weeks back. Tim, I do not have hardware, so I was bound to screw it up, but if you have some time I'd appreciate if you try them out (and if I indeed broke things if you could identify issues that would be even more awesome). Thanks! Hello Dmitry, I tested those patches and I didn't find any obvious issues. The basic functions do work (i.e. buttons and axes, don't have a HAT so I can't test that), force feedback seems to work to the extent it was before (I only have fftest though, no games that support force feedback). I'll go through a few more applications and see if anything not obvious is broken. Unfortunately, I only have that one wheel and I can only test USB connections at the moment (unless I find a proper serial adaptor, but I'm not sure if that would even work). Are those patches planned to go into 4.19 or are they intended to be merged in the next development cycle?
Re: [PATCH 01/20] Input: iforce - remove "being used" silliness
On 18.09.18 02:47, Dmitry Torokhov wrote: The kernel is supposed to handle multiple devices, static flags in packet handling code will never work. Signed-off-by: Dmitry Torokhov --- This is a random assortment of iforce patches that I made a few weeks back. Tim, I do not have hardware, so I was bound to screw it up, but if you have some time I'd appreciate if you try them out (and if I indeed broke things if you could identify issues that would be even more awesome). Thanks! Hello Dmitry, I tested those patches and I didn't find any obvious issues. The basic functions do work (i.e. buttons and axes, don't have a HAT so I can't test that), force feedback seems to work to the extent it was before (I only have fftest though, no games that support force feedback). I'll go through a few more applications and see if anything not obvious is broken. Unfortunately, I only have that one wheel and I can only test USB connections at the moment (unless I find a proper serial adaptor, but I'm not sure if that would even work). Are those patches planned to go into 4.19 or are they intended to be merged in the next development cycle?
