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

Commit 6e32819e authored by micki's avatar micki Committed by Jiri Kosina
Browse files

HID: ntrig: add support for new firwmare versions 



Signed-off-by: default avatarMicki Balanga <micki@n-trig.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent e5a2a04c

drivers/hid/hid-core.c

+18 −0
Original line number Diff line number Diff line
@@ -1337,6 +1337,24 @@ 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_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_10) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_11) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_12) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_13) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_14) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_15) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18) },

	{ 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) },

drivers/hid/hid-ids.h

+18 −0
Original line number Diff line number Diff line
@@ -391,6 +391,24 @@ 


#define USB_VENDOR_ID_NTRIG                0x1b96

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN   0x0001

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1   0x0003

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2   0x0004

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3   0x0005

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4   0x0006

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5   0x0007

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6   0x0008

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7   0x0009

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8   0x000A

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9   0x000B

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_10   0x000C

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_11   0x000D

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_12   0x000E

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_13   0x000F

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_14   0x0010

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_15   0x0011

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16   0x0012

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17   0x0013

#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18   0x0014



#define USB_VENDOR_ID_ONTRAK		0x0a07

#define USB_DEVICE_ID_ONTRAK_ADU100	0x0064

drivers/hid/hid-ntrig.c

+36 −0
Original line number Diff line number Diff line
@@ -868,6 +868,42 @@ static void ntrig_remove(struct hid_device *hdev) 
static const struct hid_device_id ntrig_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_10),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_11),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_12),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_13),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_14),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_15),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18),

		.driver_data = NTRIG_DUPLICATE_USAGES },

	{ }

};

MODULE_DEVICE_TABLE(hid, ntrig_devices);