Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid (a85821fc) · Commits · 戴 / test

drivers/hid/Kconfig

+50 −4

Original line number	Diff line number	Diff line
		@@ -55,6 +55,12 @@ source "drivers/hid/usbhid/Kconfig"
		menu "Special HID drivers"
		depends on HID

		config HID_3M_PCT
		tristate "3M PCT"
		depends on USB_HID
		---help---
		Support for 3M PCT touch screens.

		config HID_A4TECH
		tristate "A4 tech" if EMBEDDED
		depends on USB_HID
		@@ -183,6 +189,23 @@ config LOGIRUMBLEPAD2_FF
		Say Y here if you want to enable force feedback support for Logitech
		Rumblepad 2 devices.

		config LOGIG940_FF
		bool "Logitech Flight System G940 force feedback support"
		depends on HID_LOGITECH
		select INPUT_FF_MEMLESS
		help
		Say Y here if you want to enable force feedback support for Logitech
		Flight System G940 devices.

		config HID_MAGICMOUSE
		tristate "Apple MagicMouse multi-touch support"
		depends on BT_HIDP
		---help---
		Support for the Apple Magic Mouse multi-touch.

		Say Y here if you want support for the multi-touch features of the
		Apple Wireless "Magic" Mouse.

		config HID_MICROSOFT
		tristate "Microsoft" if EMBEDDED
		depends on USB_HID
		@@ -190,6 +213,12 @@ config HID_MICROSOFT
		---help---
		Support for Microsoft devices that are not fully compliant with HID standard.

		config HID_MOSART
		tristate "MosArt"
		depends on USB_HID
		---help---
		Support for MosArt dual-touch panels.

		config HID_MONTEREY
		tristate "Monterey" if EMBEDDED
		depends on USB_HID
		@@ -198,12 +227,18 @@ config HID_MONTEREY
		Support for Monterey Genius KB29E.

		config HID_NTRIG
		tristate "NTrig" if EMBEDDED
		tristate "NTrig"
		depends on USB_HID
		default !EMBEDDED
		---help---
		Support for N-Trig touch screen.

		config HID_ORTEK
		tristate "Ortek" if EMBEDDED
		depends on USB_HID
		default !EMBEDDED
		---help---
		Support for Ortek WKB-2000 wireless keyboard + mouse trackpad.

		config HID_PANTHERLORD
		tristate "Pantherlord support" if EMBEDDED
		depends on USB_HID
		@@ -227,6 +262,12 @@ config HID_PETALYNX
		---help---
		Support for Petalynx Maxter remote control.

		config HID_QUANTA
		tristate "Quanta Optical Touch"
		depends on USB_HID
		---help---
		Support for Quanta Optical Touch dual-touch panels.

		config HID_SAMSUNG
		tristate "Samsung" if EMBEDDED
		depends on USB_HID
		@@ -241,6 +282,12 @@ config HID_SONY
		---help---
		Support for Sony PS3 controller.

		config HID_STANTUM
		tristate "Stantum"
		depends on USB_HID
		---help---
		Support for Stantum multitouch panel.

		config HID_SUNPLUS
		tristate "Sunplus" if EMBEDDED
		depends on USB_HID
		@@ -305,9 +352,8 @@ config THRUSTMASTER_FF
		Rumble Force or Force Feedback Wheel.

		config HID_WACOM
		tristate "Wacom Bluetooth devices support" if EMBEDDED
		tristate "Wacom Bluetooth devices support"
		depends on BT_HIDP
		default !EMBEDDED
		---help---
		Support for Wacom Graphire Bluetooth tablet.

drivers/hid/Makefile

+9 −0

Original line number	Diff line number	Diff line
		@@ -18,7 +18,11 @@ endif
		ifdef CONFIG_LOGIRUMBLEPAD2_FF
		hid-logitech-objs += hid-lg2ff.o
		endif
		ifdef CONFIG_LOGIG940_FF
		hid-logitech-objs += hid-lg3ff.o
		endif

		obj-$(CONFIG_HID_3M_PCT) += hid-3m-pct.o
		obj-$(CONFIG_HID_A4TECH) += hid-a4tech.o
		obj-$(CONFIG_HID_APPLE) += hid-apple.o
		obj-$(CONFIG_HID_BELKIN) += hid-belkin.o
		@@ -31,14 +35,19 @@ obj-$(CONFIG_HID_GYRATION) += hid-gyration.o
		obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o
		obj-$(CONFIG_HID_KYE) += hid-kye.o
		obj-$(CONFIG_HID_LOGITECH) += hid-logitech.o
		obj-$(CONFIG_HID_MAGICMOUSE) += hid-magicmouse.o
		obj-$(CONFIG_HID_MICROSOFT) += hid-microsoft.o
		obj-$(CONFIG_HID_MONTEREY) += hid-monterey.o
		obj-$(CONFIG_HID_MOSART) += hid-mosart.o
		obj-$(CONFIG_HID_NTRIG) += hid-ntrig.o
		obj-$(CONFIG_HID_ORTEK) += hid-ortek.o
		obj-$(CONFIG_HID_QUANTA) += hid-quanta.o
		obj-$(CONFIG_HID_PANTHERLORD) += hid-pl.o
		obj-$(CONFIG_HID_PETALYNX) += hid-petalynx.o
		obj-$(CONFIG_HID_SAMSUNG) += hid-samsung.o
		obj-$(CONFIG_HID_SMARTJOYPLUS) += hid-sjoy.o
		obj-$(CONFIG_HID_SONY) += hid-sony.o
		obj-$(CONFIG_HID_STANTUM) += hid-stantum.o
		obj-$(CONFIG_HID_SUNPLUS) += hid-sunplus.o
		obj-$(CONFIG_HID_GREENASIA) += hid-gaff.o
		obj-$(CONFIG_HID_THRUSTMASTER) += hid-tmff.o

drivers/hid/hid-3m-pct.c

0 → 100644

+290 −0

Original line number	Diff line number	Diff line
		/*
		* HID driver for 3M PCT multitouch panels
		*
		* Copyright (c) 2009 Stephane Chatty <chatty@enac.fr>
		*
		*/

		/*
		* This program is free software; you can redistribute it and/or modify it
		* under the terms of the GNU General Public License as published by the Free
		* Software Foundation; either version 2 of the License, or (at your option)
		* any later version.
		*/

		#include <linux/device.h>
		#include <linux/hid.h>
		#include <linux/module.h>
		#include <linux/usb.h>

		MODULE_AUTHOR("Stephane Chatty <chatty@enac.fr>");
		MODULE_DESCRIPTION("3M PCT multitouch panels");
		MODULE_LICENSE("GPL");

		#include "hid-ids.h"

		struct mmm_finger {
		__s32 x, y;
		__u8 rank;
		bool touch, valid;
		};

		struct mmm_data {
		struct mmm_finger f[10];
		__u8 curid, num;
		bool touch, valid;
		};

		static int mmm_input_mapping(struct hid_device hdev, struct hid_input hi,
		struct hid_field field, struct hid_usage usage,
		unsigned long *bit, int max)
		{
		switch (usage->hid & HID_USAGE_PAGE) {

		case HID_UP_BUTTON:
		return -1;

		case HID_UP_GENDESK:
		switch (usage->hid) {
		case HID_GD_X:
		hid_map_usage(hi, usage, bit, max,
		EV_ABS, ABS_MT_POSITION_X);
		/* touchscreen emulation */
		input_set_abs_params(hi->input, ABS_X,
		field->logical_minimum,
		field->logical_maximum, 0, 0);
		return 1;
		case HID_GD_Y:
		hid_map_usage(hi, usage, bit, max,
		EV_ABS, ABS_MT_POSITION_Y);
		/* touchscreen emulation */
		input_set_abs_params(hi->input, ABS_Y,
		field->logical_minimum,
		field->logical_maximum, 0, 0);
		return 1;
		}
		return 0;

		case HID_UP_DIGITIZER:
		switch (usage->hid) {
		/* we do not want to map these: no input-oriented meaning */
		case 0x14:
		case 0x23:
		case HID_DG_INPUTMODE:
		case HID_DG_DEVICEINDEX:
		case HID_DG_CONTACTCOUNT:
		case HID_DG_CONTACTMAX:
		case HID_DG_INRANGE:
		case HID_DG_CONFIDENCE:
		return -1;
		case HID_DG_TIPSWITCH:
		/* touchscreen emulation */
		hid_map_usage(hi, usage, bit, max, EV_KEY, BTN_TOUCH);
		return 1;
		case HID_DG_CONTACTID:
		hid_map_usage(hi, usage, bit, max,
		EV_ABS, ABS_MT_TRACKING_ID);
		return 1;
		}
		/* let hid-input decide for the others */
		return 0;

		case 0xff000000:
		/* we do not want to map these: no input-oriented meaning */
		return -1;
		}

		return 0;
		}

		static int mmm_input_mapped(struct hid_device hdev, struct hid_input hi,
		struct hid_field field, struct hid_usage usage,
		unsigned long *bit, int max)
		{
		if (usage->type == EV_KEY \|\| usage->type == EV_ABS)
		clear_bit(usage->code, *bit);

		return 0;
		}

		/*
		* this function is called when a whole packet has been received and processed,
		* so that it can decide what to send to the input layer.
		*/
		static void mmm_filter_event(struct mmm_data md, struct input_dev input)
		{
		struct mmm_finger *oldest = 0;
		bool pressed = false, released = false;
		int i;

		/*
		* we need to iterate on all fingers to decide if we have a press
		* or a release event in our touchscreen emulation.
		*/
		for (i = 0; i < 10; ++i) {
		struct mmm_finger *f = &md->f[i];
		if (!f->valid) {
		/* this finger is just placeholder data, ignore */
		} else if (f->touch) {
		/* this finger is on the screen */
		input_event(input, EV_ABS, ABS_MT_TRACKING_ID, i);
		input_event(input, EV_ABS, ABS_MT_POSITION_X, f->x);
		input_event(input, EV_ABS, ABS_MT_POSITION_Y, f->y);
		input_mt_sync(input);
		/*
		* touchscreen emulation: maintain the age rank
		* of this finger, decide if we have a press
		*/
		if (f->rank == 0) {
		f->rank = ++(md->num);
		if (f->rank == 1)
		pressed = true;
		}
		if (f->rank == 1)
		oldest = f;
		} else {
		/* this finger took off the screen */
		/* touchscreen emulation: maintain age rank of others */
		int j;

		for (j = 0; j < 10; ++j) {
		struct mmm_finger *g = &md->f[j];
		if (g->rank > f->rank) {
		g->rank--;
		if (g->rank == 1)
		oldest = g;
		}
		}
		f->rank = 0;
		--(md->num);
		if (md->num == 0)
		released = true;
		}
		f->valid = 0;
		}

		/* touchscreen emulation */
		if (oldest) {
		if (pressed)
		input_event(input, EV_KEY, BTN_TOUCH, 1);
		input_event(input, EV_ABS, ABS_X, oldest->x);
		input_event(input, EV_ABS, ABS_Y, oldest->y);
		} else if (released) {
		input_event(input, EV_KEY, BTN_TOUCH, 0);
		}
		}

		/*
		* this function is called upon all reports
		* so that we can accumulate contact point information,
		* and call input_mt_sync after each point.
		*/
		static int mmm_event(struct hid_device hid, struct hid_field field,
		struct hid_usage *usage, __s32 value)
		{
		struct mmm_data *md = hid_get_drvdata(hid);
		/*
		* strangely, this function can be called before
		* field->hidinput is initialized!
		*/
		if (hid->claimed & HID_CLAIMED_INPUT) {
		struct input_dev *input = field->hidinput->input;
		switch (usage->hid) {
		case HID_DG_TIPSWITCH:
		md->touch = value;
		break;
		case HID_DG_CONFIDENCE:
		md->valid = value;
		break;
		case HID_DG_CONTACTID:
		if (md->valid) {
		md->curid = value;
		md->f[value].touch = md->touch;
		md->f[value].valid = 1;
		}
		break;
		case HID_GD_X:
		if (md->valid)
		md->f[md->curid].x = value;
		break;
		case HID_GD_Y:
		if (md->valid)
		md->f[md->curid].y = value;
		break;
		case HID_DG_CONTACTCOUNT:
		mmm_filter_event(md, input);
		break;
		}
		}

		/* we have handled the hidinput part, now remains hiddev */
		if (hid->claimed & HID_CLAIMED_HIDDEV && hid->hiddev_hid_event)
		hid->hiddev_hid_event(hid, field, usage, value);

		return 1;
		}

		static int mmm_probe(struct hid_device hdev, const struct hid_device_id id)
		{
		int ret;
		struct mmm_data *md;

		md = kzalloc(sizeof(struct mmm_data), GFP_KERNEL);
		if (!md) {
		dev_err(&hdev->dev, "cannot allocate 3M data\n");
		return -ENOMEM;
		}
		hid_set_drvdata(hdev, md);

		ret = hid_parse(hdev);
		if (!ret)
		ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);

		if (ret)
		kfree(md);
		return ret;
		}

		static void mmm_remove(struct hid_device *hdev)
		{
		hid_hw_stop(hdev);
		kfree(hid_get_drvdata(hdev));
		hid_set_drvdata(hdev, NULL);
		}

		static const struct hid_device_id mmm_devices[] = {
		{ HID_USB_DEVICE(USB_VENDOR_ID_3M, USB_DEVICE_ID_3M1968) },
		{ }
		};
		MODULE_DEVICE_TABLE(hid, mmm_devices);

		static const struct hid_usage_id mmm_grabbed_usages[] = {
		{ HID_ANY_ID, HID_ANY_ID, HID_ANY_ID },
		{ HID_ANY_ID - 1, HID_ANY_ID - 1, HID_ANY_ID - 1}
		};

		static struct hid_driver mmm_driver = {
		.name = "3m-pct",
		.id_table = mmm_devices,
		.probe = mmm_probe,
		.remove = mmm_remove,
		.input_mapping = mmm_input_mapping,
		.input_mapped = mmm_input_mapped,
		.usage_table = mmm_grabbed_usages,
		.event = mmm_event,
		};

		static int __init mmm_init(void)
		{
		return hid_register_driver(&mmm_driver);
		}

		static void __exit mmm_exit(void)
		{
		hid_unregister_driver(&mmm_driver);
		}

		module_init(mmm_init);
		module_exit(mmm_exit);
		MODULE_LICENSE("GPL");

drivers/hid/hid-apple.c

+12 −5

Original line number	Diff line number	Diff line
		@@ -40,6 +40,11 @@ module_param(fnmode, uint, 0644);
		MODULE_PARM_DESC(fnmode, "Mode of fn key on Apple keyboards (0 = disabled, "
		"[1] = fkeyslast, 2 = fkeysfirst)");

		static unsigned int iso_layout = 1;
		module_param(iso_layout, uint, 0644);
		MODULE_PARM_DESC(iso_layout, "Enable/Disable hardcoded ISO-layout of the keyboard. "
		"(0 = disabled, [1] = enabled)");

		struct apple_sc {
		unsigned long quirks;
		unsigned int fn_on;
		@@ -199,6 +204,7 @@ static int hidinput_apple_event(struct hid_device hid, struct input_dev input,
		}
		}

		if (iso_layout) {
		if (asc->quirks & APPLE_ISO_KEYBOARD) {
		trans = apple_find_translation(apple_iso_keyboard, usage->code);
		if (trans) {
		@@ -206,6 +212,7 @@ static int hidinput_apple_event(struct hid_device hid, struct input_dev input,
		return 1;
		}
		}
		}

		return 0;
		}

drivers/hid/hid-core.c

+16 −7

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		* Copyright (c) 1999 Andreas Gal
		* Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
		* Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
		* Copyright (c) 2006-2007 Jiri Kosina
		* Copyright (c) 2006-2010 Jiri Kosina
		*/

		/*
		@@ -51,7 +51,7 @@ EXPORT_SYMBOL_GPL(hid_debug);
		* Register a new report for a device.
		*/

		static struct hid_report hid_register_report(struct hid_device device, unsigned type, unsigned id)
		struct hid_report hid_register_report(struct hid_device device, unsigned type, unsigned id)
		{
		struct hid_report_enum *report_enum = device->report_enum + type;
		struct hid_report *report;
		@@ -75,6 +75,7 @@ static struct hid_report hid_register_report(struct hid_device device, unsigne

		return report;
		}
		EXPORT_SYMBOL_GPL(hid_register_report);

		/*
		* Register a new field for this report.
		@@ -387,7 +388,8 @@ static int hid_parser_local(struct hid_parser parser, struct hid_item item)
		__u32 data;
		unsigned n;

		if (item->size == 0) {
		/* Local delimiter could have value 0, which allows size to be 0 */
		if (item->size == 0 && item->tag != HID_LOCAL_ITEM_TAG_DELIMITER) {
		dbg_hid("item data expected for local item\n");
		return -1;
		}
		@@ -1248,11 +1250,13 @@ EXPORT_SYMBOL_GPL(hid_disconnect);

		/* a list of devices for which there is a specialized driver on HID bus */
		static const struct hid_device_id hid_blacklist[] = {
		{ HID_USB_DEVICE(USB_VENDOR_ID_3M, USB_DEVICE_ID_3M1968) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) },
		{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICMOUSE) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ISO) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI) },
		@@ -1324,6 +1328,7 @@ static const struct hid_device_id hid_blacklist[] = {
		{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WINGMAN_F3D) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WINGMAN_FFG ) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_FORCE3D_PRO) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_FLIGHT_SYSTEM_G940) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL) },
		@@ -1337,10 +1342,15 @@ static const struct hid_device_id hid_blacklist[] = {
		{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
		{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_STANTUM, USB_DEVICE_ID_MTP) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) },
		@@ -1543,8 +1553,9 @@ static const struct hid_device_id hid_ignore_list[] = {
		{ HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_24) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_AIRCABLE, USB_DEVICE_ID_AIRCABLE1) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_ALCOR, USB_DEVICE_ID_ALCOR_USBRS232) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_LCM)},
		{ HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_LCM2)},
		{ HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_T91MT)},
		{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_LCM)},
		{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_LCM2)},
		{ HID_USB_DEVICE(USB_VENDOR_ID_AVERMEDIA, USB_DEVICE_ID_AVER_FM_MR800) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_CIDC, 0x0103) },
		@@ -1661,8 +1672,6 @@ static const struct hid_device_id hid_ignore_list[] = {
		{ HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0004) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS, USB_DEVICE_ID_PHILIPS_IEEE802154_DONGLE) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_POWERCOM, USB_DEVICE_ID_POWERCOM_UPS) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY1) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY2) },
		{ 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) },

Admin message