From: Paul Walmsley <paul@booyaka.com>
To: linux-input@atrey.karlin.mff.cuni.cz
Subject: [PATCH 3/7] usbhid: convert Wacom and Codemercs quirks to list entries
Date: Sun, 18 Mar 2007 22:21:57 -0600 (MDT) [thread overview]
Message-ID: <Pine.LNX.4.64.0703182039270.21893@utopia.booyaka.com> (raw)
From: Paul Walmsley <paul@booyaka.com>
Convert the existing Wacom and Codemercs quirks from
special-purpose code to quirks list entries with non-0xffff masks.
Signed-off-by: Paul Walmsley <paul@booyaka.com>
---
dev/drivers/usb/input/hid-core.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
Index: linux/dev/drivers/usb/input/hid-core.c
===================================================================
--- linux.orig/dev/drivers/usb/input/hid-core.c
+++ linux/dev/drivers/usb/input/hid-core.c
@@ -688,7 +688,6 @@ void usbhid_init_reports(struct hid_devi
#define USB_VENDOR_ID_CODEMERCS 0x07c0
#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
@@ -949,6 +948,10 @@ static const struct hid_blacklist {
{ USB_VENDOR_ID_CIDC, 0x0103, 0xffff, HID_QUIRK_IGNORE },
+ { USB_VENDOR_ID_WACOM, 0x0000, 0x0000, HID_QUIRK_IGNORE },
+
+ { USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW_FIRST, 0xff00, HID_QUIRK_IGNORE },
+
{ 0, 0 }
};
@@ -1174,15 +1177,6 @@ static struct hid_device *usb_hid_config
int n, len, insize = 0;
struct usbhid_device *usbhid;
- /* 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;
-
quirks = lookup_quirk(le16_to_cpu(dev->descriptor.idVendor),
le16_to_cpu(dev->descriptor.idProduct));
reply other threads:[~2007-03-19 4:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.0703182039270.21893@utopia.booyaka.com \
--to=paul@booyaka.com \
--cc=linux-input@atrey.karlin.mff.cuni.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).