diff options
author | Sean Young <sean@mess.org> | 2006-07-09 09:01:02 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-09-27 14:58:49 -0400 |
commit | d5176b413dcce85334e270021fc0d723d1714c84 (patch) | |
tree | 690b664d7f75a6f4376c9a8424af79fa6eca5659 /drivers/usb/input | |
parent | b6eb2d84d2bb01e9fcc46a032a3429b4747b1c47 (diff) |
USB: Add driver for PhidgetMotorControl
This driver add support for the Phidgets Inc., MotorControl via sysfs. Also
some minor fixes for the InterfaceKit.
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/input')
-rw-r--r-- | drivers/usb/input/hid-core.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c index 3305fb6079eb..8f8d4af3f6ef 100644 --- a/drivers/usb/input/hid-core.c +++ b/drivers/usb/input/hid-core.c | |||
@@ -1535,13 +1535,17 @@ void hid_init_reports(struct hid_device *hid) | |||
1535 | #define USB_VENDOR_ID_GLAB 0x06c2 | 1535 | #define USB_VENDOR_ID_GLAB 0x06c2 |
1536 | #define USB_DEVICE_ID_4_PHIDGETSERVO_30 0x0038 | 1536 | #define USB_DEVICE_ID_4_PHIDGETSERVO_30 0x0038 |
1537 | #define USB_DEVICE_ID_1_PHIDGETSERVO_30 0x0039 | 1537 | #define USB_DEVICE_ID_1_PHIDGETSERVO_30 0x0039 |
1538 | #define USB_DEVICE_ID_8_8_8_IF_KIT 0x0045 | ||
1539 | #define USB_DEVICE_ID_0_0_4_IF_KIT 0x0040 | 1538 | #define USB_DEVICE_ID_0_0_4_IF_KIT 0x0040 |
1539 | #define USB_DEVICE_ID_0_16_16_IF_KIT 0x0044 | ||
1540 | #define USB_DEVICE_ID_8_8_8_IF_KIT 0x0045 | ||
1541 | #define USB_DEVICE_ID_0_8_7_IF_KIT 0x0051 | ||
1540 | #define USB_DEVICE_ID_0_8_8_IF_KIT 0x0053 | 1542 | #define USB_DEVICE_ID_0_8_8_IF_KIT 0x0053 |
1543 | #define USB_DEVICE_ID_PHIDGET_MOTORCONTROL 0x0058 | ||
1541 | 1544 | ||
1542 | #define USB_VENDOR_ID_WISEGROUP 0x0925 | 1545 | #define USB_VENDOR_ID_WISEGROUP 0x0925 |
1543 | #define USB_DEVICE_ID_1_PHIDGETSERVO_20 0x8101 | 1546 | #define USB_DEVICE_ID_1_PHIDGETSERVO_20 0x8101 |
1544 | #define USB_DEVICE_ID_4_PHIDGETSERVO_20 0x8104 | 1547 | #define USB_DEVICE_ID_4_PHIDGETSERVO_20 0x8104 |
1548 | #define USB_DEVICE_ID_8_8_4_IF_KIT 0x8201 | ||
1545 | #define USB_DEVICE_ID_DUAL_USB_JOYPAD 0x8866 | 1549 | #define USB_DEVICE_ID_DUAL_USB_JOYPAD 0x8866 |
1546 | 1550 | ||
1547 | #define USB_VENDOR_ID_WISEGROUP_LTD 0x6677 | 1551 | #define USB_VENDOR_ID_WISEGROUP_LTD 0x6677 |
@@ -1620,9 +1624,12 @@ static const struct hid_blacklist { | |||
1620 | { USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5, HID_QUIRK_IGNORE }, | 1624 | { USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5, HID_QUIRK_IGNORE }, |
1621 | { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_4_PHIDGETSERVO_30, HID_QUIRK_IGNORE }, | 1625 | { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_4_PHIDGETSERVO_30, HID_QUIRK_IGNORE }, |
1622 | { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_1_PHIDGETSERVO_30, HID_QUIRK_IGNORE }, | 1626 | { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_1_PHIDGETSERVO_30, HID_QUIRK_IGNORE }, |
1623 | { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_8_8_8_IF_KIT, HID_QUIRK_IGNORE }, | ||
1624 | { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_0_4_IF_KIT, HID_QUIRK_IGNORE }, | 1627 | { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_0_4_IF_KIT, HID_QUIRK_IGNORE }, |
1628 | { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_16_16_IF_KIT, HID_QUIRK_IGNORE }, | ||
1629 | { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_8_8_8_IF_KIT, HID_QUIRK_IGNORE }, | ||
1630 | { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_8_7_IF_KIT, HID_QUIRK_IGNORE }, | ||
1625 | { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_8_8_IF_KIT, HID_QUIRK_IGNORE }, | 1631 | { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_8_8_IF_KIT, HID_QUIRK_IGNORE }, |
1632 | { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_PHIDGET_MOTORCONTROL, HID_QUIRK_IGNORE }, | ||
1626 | { USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_POWERMATE, HID_QUIRK_IGNORE }, | 1633 | { USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_POWERMATE, HID_QUIRK_IGNORE }, |
1627 | { USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_SOUNDKNOB, HID_QUIRK_IGNORE }, | 1634 | { USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_SOUNDKNOB, HID_QUIRK_IGNORE }, |
1628 | { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_90, HID_QUIRK_IGNORE }, | 1635 | { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_90, HID_QUIRK_IGNORE }, |
@@ -1701,6 +1708,7 @@ static const struct hid_blacklist { | |||
1701 | { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_CYCLOPS, HID_QUIRK_IGNORE }, | 1708 | { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_CYCLOPS, HID_QUIRK_IGNORE }, |
1702 | { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_4_PHIDGETSERVO_20, HID_QUIRK_IGNORE }, | 1709 | { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_4_PHIDGETSERVO_20, HID_QUIRK_IGNORE }, |
1703 | { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20, HID_QUIRK_IGNORE }, | 1710 | { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20, HID_QUIRK_IGNORE }, |
1711 | { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_8_8_4_IF_KIT, HID_QUIRK_IGNORE }, | ||
1704 | { USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K, HID_QUIRK_IGNORE }, | 1712 | { USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K, HID_QUIRK_IGNORE }, |
1705 | 1713 | ||
1706 | { USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_FLAIR, HID_QUIRK_IGNORE }, | 1714 | { USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_FLAIR, HID_QUIRK_IGNORE }, |