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

Commit 0317a65b authored by Dennis O'Brien's avatar Dennis O'Brien Committed by Jiri Kosina
Browse files

usb, HID: Remove Vernier devices from lsusb and hid_ignore_list 

Removes Vernier Software & Technology devices from the ldusb
driver and the hid_ignore_list table of the usbhid driver in the
Linux tree.  These devices will now be supported via the hidraw
driver.

A user space driver for these devices will be found in the
Go! Software Development Kit from Vernier at
http://www.vernier.com/downloads/software-development-kits/go-sdk/.
These devices are also be supported by the LabQuest2 standalone
interface shown at http://www.vernier.com/products/interfaces/labq2/
and the LoggerPro for Linux software shown at
http://www.vernier.com/downloads/logger-pro-linux/

.

Signed-off-by: default avatarDennis O'Brien <dennis.obrien@eqware.net>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent b7212600

drivers/hid/hid-core.c

+0 −5
Original line number Diff line number Diff line
@@ -2391,11 +2391,6 @@ static const struct hid_device_id hid_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_WTP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_DPAD) },

#endif

	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_CYCLOPS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LCSPEC) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_RISO_KAGAKU, USB_DEVICE_ID_RI_KA_WEBMAIL) },

	{ }

drivers/hid/hid-ids.h

+0 −7
Original line number Diff line number Diff line
@@ -947,13 +947,6 @@ 
#define USB_DEVICE_ID_VELLEMAN_K8061_FIRST	0x8061

#define USB_DEVICE_ID_VELLEMAN_K8061_LAST	0x8068



#define USB_VENDOR_ID_VERNIER		0x08f7

#define USB_DEVICE_ID_VERNIER_LABPRO	0x0001

#define USB_DEVICE_ID_VERNIER_GOTEMP	0x0002

#define USB_DEVICE_ID_VERNIER_SKIP	0x0003

#define USB_DEVICE_ID_VERNIER_CYCLOPS	0x0004

#define USB_DEVICE_ID_VERNIER_LCSPEC	0x0006



#define USB_VENDOR_ID_VTL		0x0306

#define USB_DEVICE_ID_VTL_MULTITOUCH_FF3F	0xff3f

drivers/usb/misc/ldusb.c

+0 −10
Original line number Diff line number Diff line
@@ -69,12 +69,6 @@ 
#define USB_DEVICE_ID_LD_HYBRID		0x2090	/* USB Product ID of Automotive Hybrid */

#define USB_DEVICE_ID_LD_HEATCONTROL	0x20A0	/* USB Product ID of Heat control */



#define USB_VENDOR_ID_VERNIER		0x08f7

#define USB_DEVICE_ID_VERNIER_GOTEMP	0x0002

#define USB_DEVICE_ID_VERNIER_SKIP	0x0003

#define USB_DEVICE_ID_VERNIER_CYCLOPS	0x0004

#define USB_DEVICE_ID_VERNIER_LCSPEC	0x0006



#ifdef CONFIG_USB_DYNAMIC_MINORS

#define USB_LD_MINOR_BASE	0

#else
@@ -115,10 +109,6 @@ static const struct usb_device_id ld_usb_table[] = { 
	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MCT) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HYBRID) },

	{ USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HEATCONTROL) },

	{ USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP) },

	{ USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) },

	{ USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_CYCLOPS) },

	{ USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LCSPEC) },

	{ }					/* Terminating entry */

};

MODULE_DEVICE_TABLE(usb, ld_usb_table);