Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

HID: sjoy: Add device ID for Super Joy Box 3 



Also correct the quirks for the Super Joy Box 3 Pro and Super Dual Box.

Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent a72c5ddb

drivers/hid/hid-core.c

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

	{ HID_USB_DEVICE(USB_VENDOR_ID_UNITEC, USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19) },

	{ 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_SMARTJOY_PLUS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SUPER_JOY_BOX_3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_JOY_BOX_3_PRO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_JOY_BOX_3_PRO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_DUAL_BOX_PRO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_DUAL_BOX_PRO) },

drivers/hid/hid-ids.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -717,6 +717,7 @@ 
#define USB_DEVICE_ID_1_PHIDGETSERVO_20	0x8101

#define USB_DEVICE_ID_1_PHIDGETSERVO_20	0x8101

#define USB_DEVICE_ID_4_PHIDGETSERVO_20	0x8104

#define USB_DEVICE_ID_4_PHIDGETSERVO_20	0x8104

#define USB_DEVICE_ID_8_8_4_IF_KIT	0x8201

#define USB_DEVICE_ID_8_8_4_IF_KIT	0x8201

#define USB_DEVICE_ID_SUPER_JOY_BOX_3	0x8888

#define USB_DEVICE_ID_QUAD_USB_JOYPAD	0x8800

#define USB_DEVICE_ID_QUAD_USB_JOYPAD	0x8800

#define USB_DEVICE_ID_DUAL_USB_JOYPAD	0x8866

#define USB_DEVICE_ID_DUAL_USB_JOYPAD	0x8866

drivers/hid/hid-sjoy.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -155,7 +155,8 @@ err: 
}

}





static const struct hid_device_id sjoy_devices[] = {

static const struct hid_device_id sjoy_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_JOY_BOX_3_PRO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_JOY_BOX_3_PRO),

		.driver_data = HID_QUIRK_NOGET },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_DUAL_BOX_PRO),

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_DUAL_BOX_PRO),

		.driver_data = HID_QUIRK_MULTI_INPUT | HID_QUIRK_NOGET |

		.driver_data = HID_QUIRK_MULTI_INPUT | HID_QUIRK_NOGET |

			       HID_QUIRK_SKIP_OUTPUT_REPORTS },

			       HID_QUIRK_SKIP_OUTPUT_REPORTS },
@@ -163,8 +164,9 @@ static const struct hid_device_id sjoy_devices[] = { 
		.driver_data = HID_QUIRK_MULTI_INPUT | HID_QUIRK_NOGET |

		.driver_data = HID_QUIRK_MULTI_INPUT | HID_QUIRK_NOGET |

			       HID_QUIRK_SKIP_OUTPUT_REPORTS },

			       HID_QUIRK_SKIP_OUTPUT_REPORTS },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SUPER_JOY_BOX_3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD),

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD),

		.driver_data = HID_QUIRK_MULTI_INPUT | HID_QUIRK_NOGET |

		.driver_data = HID_QUIRK_MULTI_INPUT |

			       HID_QUIRK_SKIP_OUTPUT_REPORTS },

			       HID_QUIRK_SKIP_OUTPUT_REPORTS },

	{ }

	{ }

};

};