Commit 5ddc3229 authored by Robert Marquardt's avatar Robert Marquardt Committed by Jiri Kosina
Browse files

HID blacklisting of all Code Mercenaries IOWarrior devices 



Put all Code Mercenaries (VID 0x07c0) IOWarriors (PIDs 0x1500 to 0x15ff) on
the HID blacklist. The range of PIDs has been reserved for IOWarriors. Only
5 PIDs are really used yet.

Signed-off-by: default avatarRobert Marquardt <marquardt@codemercs.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 606135a3

drivers/usb/input/hid-core.c

+10 −11
Original line number Diff line number Diff line
@@ -689,10 +689,8 @@ void usbhid_init_reports(struct hid_device *hid) 
#define USB_DEVICE_ID_SMARTJOY_DUAL_PLUS 0x8802



#define USB_VENDOR_ID_CODEMERCS		0x07c0

#define USB_DEVICE_ID_CODEMERCS_IOW40	0x1500

#define USB_DEVICE_ID_CODEMERCS_IOW24	0x1501

#define USB_DEVICE_ID_CODEMERCS_IOW48	0x1502

#define USB_DEVICE_ID_CODEMERCS_IOW28	0x1503

#define USB_DEVICE_ID_CODEMERCS_IOW_FIRST	0x1500

#define USB_DEVICE_ID_CODEMERCS_IOW_LAST	0x15ff



#define USB_VENDOR_ID_DELORME		0x1163

#define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100
@@ -788,10 +786,6 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_AIRCABLE, USB_DEVICE_ID_AIRCABLE1, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_ALCOR, USB_DEVICE_ID_ALCOR_USBRS232, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW40, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW24, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW48, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW28, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_HIDCOM, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_ULTRAMOUSE, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE, HID_QUIRK_IGNORE },
@@ -1055,6 +1049,11 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf) 
	/* Ignore all Wacom devices */

	if (le16_to_cpu(dev->descriptor.idVendor) == USB_VENDOR_ID_WACOM)

		return NULL;

	/* ignore all Code Mercenaries IOWarrior devices */

	if (le16_to_cpu(dev->descriptor.idVendor) == USB_VENDOR_ID_CODEMERCS)

		if (le16_to_cpu(dev->descriptor.idProduct) >= USB_DEVICE_ID_CODEMERCS_IOW_FIRST &&

		    le16_to_cpu(dev->descriptor.idProduct) <= USB_DEVICE_ID_CODEMERCS_IOW_LAST)

			return NULL;



	for (n = 0; hid_blacklist[n].idVendor; n++)

		if ((hid_blacklist[n].idVendor == le16_to_cpu(dev->descriptor.idVendor)) &&

CRA Git | Maintained and supported by SUSTech CRA and CCSE