tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

HID: ntrig: add support for new firwmare versions

Signed-off-by: Micki Balanga <micki@n-trig.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

authored by micki and committed by Jiri Kosina 6e32819e e5a2a04c

+72
unified split
+18
drivers/hid/hid-core.c
··· 1337 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) }, 1338 { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) }, 1339 { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) }, 1340 { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) }, 1341 { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) }, 1342 { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },
··· 1337 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) }, 1338 { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) }, 1339 { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) }, 1340 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1) }, 1341 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2) }, 1342 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3) }, 1343 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4) }, 1344 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5) }, 1345 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6) }, 1346 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7) }, 1347 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8) }, 1348 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9) }, 1349 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_10) }, 1350 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_11) }, 1351 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_12) }, 1352 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_13) }, 1353 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_14) }, 1354 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_15) }, 1355 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16) }, 1356 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17) }, 1357 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18) }, 1358 { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) }, 1359 { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) }, 1360 { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },
+18
drivers/hid/hid-ids.h
··· 391 392 #define USB_VENDOR_ID_NTRIG 0x1b96 393 #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN 0x0001 394 395 #define USB_VENDOR_ID_ONTRAK 0x0a07 396 #define USB_DEVICE_ID_ONTRAK_ADU100 0x0064
··· 391 392 #define USB_VENDOR_ID_NTRIG 0x1b96 393 #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN 0x0001 394 + #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1 0x0003 395 + #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2 0x0004 396 + #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3 0x0005 397 + #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4 0x0006 398 + #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5 0x0007 399 + #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6 0x0008 400 + #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7 0x0009 401 + #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8 0x000A 402 + #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9 0x000B 403 + #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_10 0x000C 404 + #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_11 0x000D 405 + #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_12 0x000E 406 + #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_13 0x000F 407 + #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_14 0x0010 408 + #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_15 0x0011 409 + #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16 0x0012 410 + #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17 0x0013 411 + #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18 0x0014 412 413 #define USB_VENDOR_ID_ONTRAK 0x0a07 414 #define USB_DEVICE_ID_ONTRAK_ADU100 0x0064
+36
drivers/hid/hid-ntrig.c
··· 868 static const struct hid_device_id ntrig_devices[] = { 869 { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN), 870 .driver_data = NTRIG_DUPLICATE_USAGES }, 871 { } 872 }; 873 MODULE_DEVICE_TABLE(hid, ntrig_devices);
··· 868 static const struct hid_device_id ntrig_devices[] = { 869 { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN), 870 .driver_data = NTRIG_DUPLICATE_USAGES }, 871 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1), 872 + .driver_data = NTRIG_DUPLICATE_USAGES }, 873 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_2), 874 + .driver_data = NTRIG_DUPLICATE_USAGES }, 875 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_3), 876 + .driver_data = NTRIG_DUPLICATE_USAGES }, 877 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_4), 878 + .driver_data = NTRIG_DUPLICATE_USAGES }, 879 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_5), 880 + .driver_data = NTRIG_DUPLICATE_USAGES }, 881 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_6), 882 + .driver_data = NTRIG_DUPLICATE_USAGES }, 883 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_7), 884 + .driver_data = NTRIG_DUPLICATE_USAGES }, 885 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_8), 886 + .driver_data = NTRIG_DUPLICATE_USAGES }, 887 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_9), 888 + .driver_data = NTRIG_DUPLICATE_USAGES }, 889 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_10), 890 + .driver_data = NTRIG_DUPLICATE_USAGES }, 891 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_11), 892 + .driver_data = NTRIG_DUPLICATE_USAGES }, 893 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_12), 894 + .driver_data = NTRIG_DUPLICATE_USAGES }, 895 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_13), 896 + .driver_data = NTRIG_DUPLICATE_USAGES }, 897 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_14), 898 + .driver_data = NTRIG_DUPLICATE_USAGES }, 899 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_15), 900 + .driver_data = NTRIG_DUPLICATE_USAGES }, 901 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16), 902 + .driver_data = NTRIG_DUPLICATE_USAGES }, 903 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17), 904 + .driver_data = NTRIG_DUPLICATE_USAGES }, 905 + { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18), 906 + .driver_data = NTRIG_DUPLICATE_USAGES }, 907 { } 908 }; 909 MODULE_DEVICE_TABLE(hid, ntrig_devices);