* [PATCH] Support force feedback on MP-8866
@ 2011-08-14 19:42 Sean Young
2011-08-15 15:32 ` Jussi Kivilinna
0 siblings, 1 reply; 3+ messages in thread
From: Sean Young @ 2011-08-14 19:42 UTC (permalink / raw)
To: Jiri Kosina, Jussi Kivilinna, linux-input
Support force feedback on the Dual USB Force Feedback Joypad (MP-8866).
Note I do not have the Smartjoy Plus hardware to test if the driver
still works with that. It should not be affected, though.
Signed-off-by: Sean Young <sean@mess.org>
---
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 6f3289a..416128a 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1494,6 +1494,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_UNITEC, USB_DEVICE_ID_UNITEC_USB_TOUCH_0709) },
{ HID_USB_DEVICE(USB_VENDOR_ID_UNITEC, USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19) },
{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD) },
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },
{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SLIM_TABLET_5_8_INCH) },
{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SLIM_TABLET_12_1_INCH) },
diff --git a/drivers/hid/hid-sjoy.c b/drivers/hid/hid-sjoy.c
index 16f7caf..6140943 100644
--- a/drivers/hid/hid-sjoy.c
+++ b/drivers/hid/hid-sjoy.c
@@ -65,8 +65,7 @@ static int sjoyff_init(struct hid_device *hid)
{
struct sjoyff_device *sjoyff;
struct hid_report *report;
- struct hid_input *hidinput = list_entry(hid->inputs.next,
- struct hid_input, list);
+ struct hid_input *hidinput;
struct list_head *report_list =
&hid->report_enum[HID_OUTPUT_REPORT].report_list;
struct list_head *report_ptr = report_list;
@@ -78,43 +77,45 @@ static int sjoyff_init(struct hid_device *hid)
return -ENODEV;
}
- report_ptr = report_ptr->next;
+ list_for_each_entry(hidinput, &hid->inputs, list) {
+ report_ptr = report_ptr->next;
- if (report_ptr == report_list) {
- hid_err(hid, "required output report is missing\n");
- return -ENODEV;
- }
+ if (report_ptr == report_list) {
+ hid_err(hid, "required output report is missing\n");
+ return -ENODEV;
+ }
- report = list_entry(report_ptr, struct hid_report, list);
- if (report->maxfield < 1) {
- hid_err(hid, "no fields in the report\n");
- return -ENODEV;
- }
+ report = list_entry(report_ptr, struct hid_report, list);
+ if (report->maxfield < 1) {
+ hid_err(hid, "no fields in the report\n");
+ return -ENODEV;
+ }
- if (report->field[0]->report_count < 3) {
- hid_err(hid, "not enough values in the field\n");
- return -ENODEV;
- }
+ if (report->field[0]->report_count < 3) {
+ hid_err(hid, "not enough values in the field\n");
+ return -ENODEV;
+ }
- sjoyff = kzalloc(sizeof(struct sjoyff_device), GFP_KERNEL);
- if (!sjoyff)
- return -ENOMEM;
+ sjoyff = kzalloc(sizeof(struct sjoyff_device), GFP_KERNEL);
+ if (!sjoyff)
+ return -ENOMEM;
- dev = hidinput->input;
+ dev = hidinput->input;
- set_bit(FF_RUMBLE, dev->ffbit);
+ set_bit(FF_RUMBLE, dev->ffbit);
- error = input_ff_create_memless(dev, sjoyff, hid_sjoyff_play);
- if (error) {
- kfree(sjoyff);
- return error;
- }
+ error = input_ff_create_memless(dev, sjoyff, hid_sjoyff_play);
+ if (error) {
+ kfree(sjoyff);
+ return error;
+ }
- sjoyff->report = report;
- sjoyff->report->field[0]->value[0] = 0x01;
- sjoyff->report->field[0]->value[1] = 0x00;
- sjoyff->report->field[0]->value[2] = 0x00;
- usbhid_submit_report(hid, sjoyff->report, USB_DIR_OUT);
+ sjoyff->report = report;
+ sjoyff->report->field[0]->value[0] = 0x01;
+ sjoyff->report->field[0]->value[1] = 0x00;
+ sjoyff->report->field[0]->value[2] = 0x00;
+ usbhid_submit_report(hid, sjoyff->report, USB_DIR_OUT);
+ }
hid_info(hid, "Force feedback for SmartJoy PLUS PS2/USB adapter\n");
@@ -131,6 +132,8 @@ static int sjoy_probe(struct hid_device *hdev, const struct hid_device_id *id)
{
int ret;
+ hdev->quirks |= id->driver_data;
+
ret = hid_parse(hdev);
if (ret) {
hid_err(hdev, "parse failed\n");
@@ -152,6 +155,9 @@ err:
static const struct hid_device_id sjoy_devices[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD),
+ .driver_data = HID_QUIRK_MULTI_INPUT | HID_QUIRK_NOGET |
+ HID_QUIRK_SKIP_OUTPUT_REPORTS },
{ }
};
MODULE_DEVICE_TABLE(hid, sjoy_devices);
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 621959d..df618a3 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -79,7 +79,6 @@ static const struct hid_blacklist {
{ USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP8060U, HID_QUIRK_MULTI_INPUT },
{ USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH, HID_QUIRK_MULTI_INPUT },
{ USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_14_1_INCH, HID_QUIRK_MULTI_INPUT },
- { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT | HID_QUIRK_SKIP_OUTPUT_REPORTS },
{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
{ USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Support force feedback on MP-8866
2011-08-14 19:42 [PATCH] Support force feedback on MP-8866 Sean Young
@ 2011-08-15 15:32 ` Jussi Kivilinna
2011-08-15 21:37 ` Jiri Kosina
0 siblings, 1 reply; 3+ messages in thread
From: Jussi Kivilinna @ 2011-08-15 15:32 UTC (permalink / raw)
To: Sean Young; +Cc: Jiri Kosina, linux-input
Quoting Sean Young <sean@mess.org>:
> Support force feedback on the Dual USB Force Feedback Joypad (MP-8866).
>
> Note I do not have the Smartjoy Plus hardware to test if the driver
> still works with that. It should not be affected, though.
Works fine with SmartJoy Plus.
Acked-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
>
> Signed-off-by: Sean Young <sean@mess.org>
> ---
> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
> index 6f3289a..416128a 100644
> --- a/drivers/hid/hid-core.c
> +++ b/drivers/hid/hid-core.c
> @@ -1494,6 +1494,7 @@ static const struct hid_device_id
> hid_have_special_driver[] = {
> { HID_USB_DEVICE(USB_VENDOR_ID_UNITEC,
> USB_DEVICE_ID_UNITEC_USB_TOUCH_0709) },
> { HID_USB_DEVICE(USB_VENDOR_ID_UNITEC,
> USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19) },
> { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD) },
> { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM,
> USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },
> { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP,
> USB_DEVICE_ID_WALTOP_SLIM_TABLET_5_8_INCH) },
> { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP,
> USB_DEVICE_ID_WALTOP_SLIM_TABLET_12_1_INCH) },
> diff --git a/drivers/hid/hid-sjoy.c b/drivers/hid/hid-sjoy.c
> index 16f7caf..6140943 100644
> --- a/drivers/hid/hid-sjoy.c
> +++ b/drivers/hid/hid-sjoy.c
> @@ -65,8 +65,7 @@ static int sjoyff_init(struct hid_device *hid)
> {
> struct sjoyff_device *sjoyff;
> struct hid_report *report;
> - struct hid_input *hidinput = list_entry(hid->inputs.next,
> - struct hid_input, list);
> + struct hid_input *hidinput;
> struct list_head *report_list =
> &hid->report_enum[HID_OUTPUT_REPORT].report_list;
> struct list_head *report_ptr = report_list;
> @@ -78,43 +77,45 @@ static int sjoyff_init(struct hid_device *hid)
> return -ENODEV;
> }
>
> - report_ptr = report_ptr->next;
> + list_for_each_entry(hidinput, &hid->inputs, list) {
> + report_ptr = report_ptr->next;
>
> - if (report_ptr == report_list) {
> - hid_err(hid, "required output report is missing\n");
> - return -ENODEV;
> - }
> + if (report_ptr == report_list) {
> + hid_err(hid, "required output report is missing\n");
> + return -ENODEV;
> + }
>
> - report = list_entry(report_ptr, struct hid_report, list);
> - if (report->maxfield < 1) {
> - hid_err(hid, "no fields in the report\n");
> - return -ENODEV;
> - }
> + report = list_entry(report_ptr, struct hid_report, list);
> + if (report->maxfield < 1) {
> + hid_err(hid, "no fields in the report\n");
> + return -ENODEV;
> + }
>
> - if (report->field[0]->report_count < 3) {
> - hid_err(hid, "not enough values in the field\n");
> - return -ENODEV;
> - }
> + if (report->field[0]->report_count < 3) {
> + hid_err(hid, "not enough values in the field\n");
> + return -ENODEV;
> + }
>
> - sjoyff = kzalloc(sizeof(struct sjoyff_device), GFP_KERNEL);
> - if (!sjoyff)
> - return -ENOMEM;
> + sjoyff = kzalloc(sizeof(struct sjoyff_device), GFP_KERNEL);
> + if (!sjoyff)
> + return -ENOMEM;
>
> - dev = hidinput->input;
> + dev = hidinput->input;
>
> - set_bit(FF_RUMBLE, dev->ffbit);
> + set_bit(FF_RUMBLE, dev->ffbit);
>
> - error = input_ff_create_memless(dev, sjoyff, hid_sjoyff_play);
> - if (error) {
> - kfree(sjoyff);
> - return error;
> - }
> + error = input_ff_create_memless(dev, sjoyff, hid_sjoyff_play);
> + if (error) {
> + kfree(sjoyff);
> + return error;
> + }
>
> - sjoyff->report = report;
> - sjoyff->report->field[0]->value[0] = 0x01;
> - sjoyff->report->field[0]->value[1] = 0x00;
> - sjoyff->report->field[0]->value[2] = 0x00;
> - usbhid_submit_report(hid, sjoyff->report, USB_DIR_OUT);
> + sjoyff->report = report;
> + sjoyff->report->field[0]->value[0] = 0x01;
> + sjoyff->report->field[0]->value[1] = 0x00;
> + sjoyff->report->field[0]->value[2] = 0x00;
> + usbhid_submit_report(hid, sjoyff->report, USB_DIR_OUT);
> + }
>
> hid_info(hid, "Force feedback for SmartJoy PLUS PS2/USB adapter\n");
>
> @@ -131,6 +132,8 @@ static int sjoy_probe(struct hid_device *hdev,
> const struct hid_device_id *id)
> {
> int ret;
>
> + hdev->quirks |= id->driver_data;
> +
> ret = hid_parse(hdev);
> if (ret) {
> hid_err(hdev, "parse failed\n");
> @@ -152,6 +155,9 @@ err:
>
> static const struct hid_device_id sjoy_devices[] = {
> { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD),
> + .driver_data = HID_QUIRK_MULTI_INPUT | HID_QUIRK_NOGET |
> + HID_QUIRK_SKIP_OUTPUT_REPORTS },
> { }
> };
> MODULE_DEVICE_TABLE(hid, sjoy_devices);
> diff --git a/drivers/hid/usbhid/hid-quirks.c
> b/drivers/hid/usbhid/hid-quirks.c
> index 621959d..df618a3 100644
> --- a/drivers/hid/usbhid/hid-quirks.c
> +++ b/drivers/hid/usbhid/hid-quirks.c
> @@ -79,7 +79,6 @@ static const struct hid_blacklist {
> { USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP8060U,
> HID_QUIRK_MULTI_INPUT },
> { USB_VENDOR_ID_WALTOP,
> USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH, HID_QUIRK_MULTI_INPUT },
> { USB_VENDOR_ID_WALTOP,
> USB_DEVICE_ID_WALTOP_MEDIA_TABLET_14_1_INCH, HID_QUIRK_MULTI_INPUT },
> - { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD,
> HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT |
> HID_QUIRK_SKIP_OUTPUT_REPORTS },
> { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD,
> HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
>
> { USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS,
> HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Support force feedback on MP-8866
2011-08-15 15:32 ` Jussi Kivilinna
@ 2011-08-15 21:37 ` Jiri Kosina
0 siblings, 0 replies; 3+ messages in thread
From: Jiri Kosina @ 2011-08-15 21:37 UTC (permalink / raw)
To: Jussi Kivilinna; +Cc: Sean Young, linux-input
On Mon, 15 Aug 2011, Jussi Kivilinna wrote:
> > Support force feedback on the Dual USB Force Feedback Joypad (MP-8866).
> >
> > Note I do not have the Smartjoy Plus hardware to test if the driver
> > still works with that. It should not be affected, though.
>
> Works fine with SmartJoy Plus.
>
> Acked-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Applied, thanks Sean and Jussi.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-08-15 21:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-14 19:42 [PATCH] Support force feedback on MP-8866 Sean Young
2011-08-15 15:32 ` Jussi Kivilinna
2011-08-15 21:37 ` Jiri Kosina
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).