Skip to content

Commit d0091f5

Browse files
seanyoungJiri Kosina
authored andcommitted
HID: core: remove phidgets from ignore list
Once there were kernel drivers for some of the phidgets devices, and for those kernel drivers to work the hid system needed exceptions. Now the kernel drivers are long gone in favour of the user-space drivers. The user-space drivers support many more phidget devices and uses libusb. The udev rules set up permissions so that the kernel hid driver can be unbound from libusb, as it does for many devices not in hid_ignore_list. http://www.phidgets.com/docs/OS_-_Linux Signed-off-by: Sean Young <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
1 parent c6f2104 commit d0091f5

File tree

2 files changed

+0
-24
lines changed

2 files changed

+0
-24
lines changed

drivers/hid/hid-core.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2265,14 +2265,6 @@ static const struct hid_device_id hid_ignore_list[] = {
22652265
{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0001) },
22662266
{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0002) },
22672267
{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0004) },
2268-
{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_4_PHIDGETSERVO_30) },
2269-
{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_1_PHIDGETSERVO_30) },
2270-
{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_0_4_IF_KIT) },
2271-
{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_16_16_IF_KIT) },
2272-
{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_8_8_8_IF_KIT) },
2273-
{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_8_7_IF_KIT) },
2274-
{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_8_8_IF_KIT) },
2275-
{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_PHIDGET_MOTORCONTROL) },
22762268
{ HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_SUPER_Q2) },
22772269
{ HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_GOGOPEN) },
22782270
{ HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_PENPOWER) },
@@ -2404,9 +2396,6 @@ static const struct hid_device_id hid_ignore_list[] = {
24042396
{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) },
24052397
{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_CYCLOPS) },
24062398
{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LCSPEC) },
2407-
{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_4_PHIDGETSERVO_20) },
2408-
{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20) },
2409-
{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_8_8_4_IF_KIT) },
24102399
{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
24112400
{ HID_USB_DEVICE(USB_VENDOR_ID_RISO_KAGAKU, USB_DEVICE_ID_RI_KA_WEBMAIL) },
24122401
{ }

drivers/hid/hid-ids.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -362,16 +362,6 @@
362362
#define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_010A 0x010a
363363
#define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_E100 0xe100
364364

365-
#define USB_VENDOR_ID_GLAB 0x06c2
366-
#define USB_DEVICE_ID_4_PHIDGETSERVO_30 0x0038
367-
#define USB_DEVICE_ID_1_PHIDGETSERVO_30 0x0039
368-
#define USB_DEVICE_ID_0_0_4_IF_KIT 0x0040
369-
#define USB_DEVICE_ID_0_16_16_IF_KIT 0x0044
370-
#define USB_DEVICE_ID_8_8_8_IF_KIT 0x0045
371-
#define USB_DEVICE_ID_0_8_7_IF_KIT 0x0051
372-
#define USB_DEVICE_ID_0_8_8_IF_KIT 0x0053
373-
#define USB_DEVICE_ID_PHIDGET_MOTORCONTROL 0x0058
374-
375365
#define USB_VENDOR_ID_GOODTOUCH 0x1aad
376366
#define USB_DEVICE_ID_GOODTOUCH_000f 0x000f
377367

@@ -982,9 +972,6 @@
982972

983973
#define USB_VENDOR_ID_WISEGROUP 0x0925
984974
#define USB_DEVICE_ID_SMARTJOY_PLUS 0x0005
985-
#define USB_DEVICE_ID_1_PHIDGETSERVO_20 0x8101
986-
#define USB_DEVICE_ID_4_PHIDGETSERVO_20 0x8104
987-
#define USB_DEVICE_ID_8_8_4_IF_KIT 0x8201
988975
#define USB_DEVICE_ID_SUPER_JOY_BOX_3 0x8888
989976
#define USB_DEVICE_ID_QUAD_USB_JOYPAD 0x8800
990977
#define USB_DEVICE_ID_DUAL_USB_JOYPAD 0x8866

0 commit comments

Comments
 (0)