Commit ad395cca authored by Sean Young's avatar Sean Young Committed by Jiri Kosina
Browse files

IHD: Support force feedback on MP-8866 



Support force feedback on the Dual USB Force Feedback Joypad (MP-8866).

Signed-off-by: default avatarSean Young <sean@mess.org>
Acked-by: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent f6f554f0

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1517,6 +1517,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) },

drivers/hid/hid-sjoy.c

+37 −31
Original line number Diff line number Diff line
@@ -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,6 +77,7 @@ static int sjoyff_init(struct hid_device *hid) 
		return -ENODEV;

	}



	list_for_each_entry(hidinput, &hid->inputs, list) {

		report_ptr = report_ptr->next;



		if (report_ptr == report_list) {
@@ -115,6 +115,7 @@ static int sjoyff_init(struct hid_device *hid) 
		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 @@ static int sjoy_probe(struct hid_device *hdev, const struct hid_device_id *id) 


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);

drivers/hid/usbhid/hid-quirks.c

+0 −1
Original line number Diff line number Diff line
@@ -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 },