Adding upstream version 4.2.4.upstream/4.2.4

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 106 insertions, 11 deletions

diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 0c2283f..1f830e3 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -37,6 +37,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x0003, "Club Mac" },
     { 0x0004, "Nebraska Furniture Mart" },
     { 0x0011, "Unknown" },
+    { 0x001f, "Walmart" },
     { 0x0040, "Anyware Corporation" },
     { 0x0042, "DMT" },
     { 0x0053, "Planex" },
@@ -1226,6 +1227,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x0a2c, "AK-Modul-Bus Computer GmbH" },
     { 0x0a34, "TG3 Electronics, Inc." },
     { 0x0a35, "Radikal Technologies" },
+    { 0x0a38, "IRIS sa" },
     { 0x0a39, "Gilat Satellite Networks, Ltd" },
     { 0x0a3a, "PentaMedia Co., Ltd" },
     { 0x0a3c, "NTT DoCoMo, Inc." },
@@ -3463,6 +3465,7 @@ static const value_string usb_products_vals[] = {
     { 0x00020002, "passport00" },
     { 0x00027007, "HPRT XT300" },
     { 0x00117788, "counterfeit flash drive" },
+    { 0x001f0b21, "AB13X Headset Adapter" },
     { 0x0040073d, "Mini Multimedia 2.4GHz Wireless Keyboard with Touch Pad" },
     { 0x00535301, "GW-US54ZGL 802.11bg" },
     { 0x00780006, "Joystick" },
@@ -3608,6 +3611,7 @@ static const value_string usb_products_vals[] = {
     { 0x03f00012, "DeskJet 1125C Printer Port" },
     { 0x03f00024, "KU-0316 Keyboard" },
     { 0x03f0002a, "LaserJet P1102" },
+    { 0x03f00036, "CCID Smartcard Keyboard KUS0133" },
     { 0x03f00053, "DeskJet 2620 All-in-One Printer" },
     { 0x03f00101, "ScanJet 4100c" },
     { 0x03f00102, "PhotoSmart S20" },
@@ -4175,9 +4179,9 @@ static const value_string usb_products_vals[] = {
     { 0x03f3008c, "AVC-2310 Device" },
     { 0x03f30094, "eHome Infrared Receiver" },
     { 0x03f3009b, "AVC-1410 GameBridge TV NTSC" },
-    { 0x03f32000, "USBXchange" },
+    { 0x03f32000, "USBXchange Firmware Loader" },
     { 0x03f32001, "USBXchange Adapter" },
-    { 0x03f32002, "USB2-Xchange" },
+    { 0x03f32002, "USB2-Xchange Firmware Loader" },
     { 0x03f32003, "USB2-Xchange Adapter" },
     { 0x03f34000, "4-port hub" },
     { 0x03f3adcc, "Composite Device Support" },
@@ -4233,6 +4237,9 @@ static const value_string usb_products_vals[] = {
     { 0x0403601f, "FT601 32-bit FIFO IC" },
     { 0x04036ee0, "EZO Carrier Board" },
     { 0x04036f70, "HB-RF-USB" },
+    { 0x04037150, "FT2232x wired for MPSSE+UART" },
+    { 0x04037151, "FT2232x wired for MPSSE+UART" },
+    { 0x04037152, "FreeCalypso dual UART with boot control" },
     { 0x04037be8, "FT232R" },
     { 0x04038028, "Dev board JTAG (FT232H based)" },
     { 0x04038040, "4 Port Hub" },
@@ -5176,6 +5183,7 @@ static const value_string usb_products_vals[] = {
     { 0x04243fcc, "RME MADIface" },
     { 0x04244041, "Hub and media card controller" },
     { 0x04244060, "Ultra Fast Media Reader" },
+    { 0x04244063, "xD/SD/MS/MMC Reader" },
     { 0x04244064, "Ultra Fast Media Reader" },
     { 0x04244712, "USB4712 high-speed hub" },
     { 0x04244713, "USB4715 high-speed hub (2 ports disabled)" },
@@ -5411,6 +5419,8 @@ static const value_string usb_products_vals[] = {
     { 0x043e9800, "Remote Control Receiver_iMON" },
     { 0x043e9803, "eHome Infrared Receiver" },
     { 0x043e9804, "DMB Receiver Control" },
+    { 0x043e9a10, "34UC88-B" },
+    { 0x043e9a11, "34UC88-B" },
     { 0x043e9a39, "27UP850 - WK.AEUDCSN - External Monitor 4K" },
     { 0x043e9c01, "LGE Sync" },
     { 0x04411456, "Hub" },
@@ -5803,6 +5813,8 @@ static const value_string usb_products_vals[] = {
     { 0x045e02e6, "Xbox Wireless Adapter for Windows" },
     { 0x045e02ea, "Xbox One Controller" },
     { 0x045e02fd, "Xbox One S Controller [Bluetooth]" },
+    { 0x045e02fe, "Xbox Wireless Adapter for Windows" },
+    { 0x045e0306, "Surface Pro 7 SD Card Reader" },
     { 0x045e0400, "Windows Powered Pocket PC 2002" },
     { 0x045e0401, "Windows Powered Pocket PC 2002" },
     { 0x045e0402, "Windows Powered Pocket PC 2002" },
@@ -5980,6 +5992,7 @@ static const value_string usb_products_vals[] = {
     { 0x045e0800, "Wireless keyboard (All-in-One-Media)" },
     { 0x045e0810, "LifeCam HD-3000" },
     { 0x045e0823, "Classic IntelliMouse" },
+    { 0x045e082a, "Pro Intellimouse" },
     { 0x045e0900, "Surface Dock Hub" },
     { 0x045e0901, "Surface Dock Hub" },
     { 0x045e0902, "Surface Dock Hub" },
@@ -6535,10 +6548,10 @@ static const value_string usb_products_vals[] = {
     { 0x046dc52b, "Unifying Receiver" },
     { 0x046dc52d, "R700 Remote Presenter receiver" },
     { 0x046dc52e, "MK260 Wireless Combo Receiver" },
-    { 0x046dc52f, "Unifying Receiver" },
+    { 0x046dc52f, "Nano Receiver" },
     { 0x046dc531, "C-U0007 [Unifying Receiver]" },
     { 0x046dc532, "Unifying Receiver" },
-    { 0x046dc534, "Unifying Receiver" },
+    { 0x046dc534, "Nano Receiver" },
     { 0x046dc537, "Cordless Mouse Receiver" },
     { 0x046dc539, "Lightspeed Receiver" },
     { 0x046dc53a, "PowerPlay Wireless Charging System" },
@@ -6942,6 +6955,7 @@ static const value_string usb_products_vals[] = {
     { 0x04835720, "Mass Storage Device" },
     { 0x04835721, "Interrupt Demo" },
     { 0x04835722, "Bulk Demo" },
+    { 0x0483572a, "STM32F401 microcontroller [ARM Cortex M4] [CDC/ACM serial port]" },
     { 0x04835730, "Audio Speaker" },
     { 0x04835731, "Microphone" },
     { 0x04835740, "Virtual COM Port" },
@@ -6980,7 +6994,7 @@ static const value_string usb_products_vals[] = {
     { 0x0489e07a, "Broadcom BCM20702A1 Bluetooth" },
     { 0x0489e0c8, "MediaTek MT7921 Bluetooth" },
     { 0x0489e0cd, "MediaTek Bluetooth Adapter" },
-    { 0x0489e0d8, "Bluetooth Adapter" },
+    { 0x0489e0d8, "Bluetooth 5.2 Adapter [MediaTek MT7922]" },
     { 0x0489e111, "Foxconn (for Lenovo) IdeaTab A2109/A2110/Medion LIFETAB S9714" },
     { 0x048d1165, "IT1165 Flash Controller" },
     { 0x048d1172, "Flash Drive" },
@@ -8538,6 +8552,11 @@ static const value_string usb_products_vals[] = {
     { 0x04bf0320, "Bluetooth Adapter" },
     { 0x04bf0321, "Bluetooth Device" },
     { 0x04bf0a28, "INDI AV-IN Device" },
+    { 0x04bf1301, "Network Controller" },
+    { 0x04bf1302, "i3 Gateway" },
+    { 0x04bf1303, "3 Micro Module" },
+    { 0x04bf1304, "i3 Module" },
+    { 0x04bf1305, "i3 Multi Sensing Module" },
     { 0x04c10020, "56K Voice Pro" },
     { 0x04c10022, "56K Voice Pro" },
     { 0x04c1007e, "ISDN TA" },
@@ -8590,6 +8609,7 @@ static const value_string usb_products_vals[] = {
     { 0x04c8072c, "Revio KD20M" },
     { 0x04c8072d, "Revio KD410Z" },
     { 0x04ca0020, "USB Keyboard" },
+    { 0x04ca003a, "Multimedia Keyboard" },
     { 0x04ca004b, "Keyboard" },
     { 0x04ca004f, "SK-9020 keyboard" },
     { 0x04ca008a, "Acer Wired Mouse Model SM-9023" },
@@ -8763,6 +8783,7 @@ static const value_string usb_products_vals[] = {
     { 0x04cb02f0, "Fuji Fujifilm X-H2S" },
     { 0x04cb02f2, "Fuji Fujifilm X-H2" },
     { 0x04cb02fc, "Fuji Fujifilm X-T5" },
+    { 0x04cb0305, "Fuji Fujifilm X100VI" },
     { 0x04cb5006, "ASK-300" },
     { 0x04cb5007, "DX100" },
     { 0x04cc1122, "Hub" },
@@ -8857,6 +8878,7 @@ static const value_string usb_products_vals[] = {
     { 0x04d91400, "PS/2 keyboard + mouse controller" },
     { 0x04d91503, "Keyboard" },
     { 0x04d91603, "Keyboard" },
+    { 0x04d91605, "Keyboard" },
     { 0x04d91702, "Keyboard LKS02" },
     { 0x04d91818, "Keyboard [Diatec Filco Majestouch 2]" },
     { 0x04d92011, "Keyboard [Diatec Filco Majestouch 1]" },
@@ -9470,6 +9492,7 @@ static const value_string usb_products_vals[] = {
     { 0x04f2b681, "ThinkPad T490 Webcam" },
     { 0x04f2b71a, "Integrated IR Camera" },
     { 0x04f2b76b, "SunplusIT Inc [HP HD Camera]" },
+    { 0x04f2b7b4, "Integrated Camera (1920x1080)" },
     { 0x04f3000a, "Touchscreen" },
     { 0x04f30103, "ActiveJet K-2024 Multimedia Keyboard" },
     { 0x04f3016f, "Touchscreen" },
@@ -10081,6 +10104,8 @@ static const value_string usb_products_vals[] = {
     { 0x04fcffff, "PureDigital Ritz Disposable" },
     { 0x04fd0003, "Smart Card Reader II" },
     { 0x04fe0006, "Happy Hacking Keyboard Lite2" },
+    { 0x04fe0020, "HHKB-Classic" },
+    { 0x04fe0021, "Happy Hacking Keyboard Professional HYBRID Type-S" },
     { 0x05000001, "DART Keyboard Mouse" },
     { 0x05000002, "DART-2 Keyboard" },
     { 0x05020001, "Handheld" },
@@ -10175,6 +10200,7 @@ static const value_string usb_products_vals[] = {
     { 0x050d0081, "F8T001v2 Bluetooth" },
     { 0x050d0083, "Bluetooth Device" },
     { 0x050d0084, "F8T003v2 Bluetooth" },
+    { 0x050d008a, "6-in-1 Multiport Adapter" },
     { 0x050d0102, "Flip KVM" },
     { 0x050d0103, "F5U103 Serial Adapter [etek]" },
     { 0x050d0106, "VideoBus II Adapter, Video" },
@@ -10620,6 +10646,7 @@ static const value_string usb_products_vals[] = {
     { 0x054c0568, "DSC-H100 in Mass Storage mode" },
     { 0x054c0574, "Sony SLT-A65V" },
     { 0x054c0577, "Sony SLT-A77V" },
+    { 0x054c0579, "Sony NEX-5N" },
     { 0x054c057d, "Sony NEX-7" },
     { 0x054c059a, "Sony NWZ-B163F" },
     { 0x054c05a6, "Sony NWZ-E464" },
@@ -10637,6 +10664,7 @@ static const value_string usb_products_vals[] = {
     { 0x054c0675, "Sony SLT-A99v" },
     { 0x054c0678, "Sony NEX-6" },
     { 0x054c0689, "Sony NWZ-B173F" },
+    { 0x054c068c, "UP-D711" },
     { 0x054c06a9, "Sony NWZ-E474" },
     { 0x054c06ac, "Sony Xperia Tablet S - SGPT12" },
     { 0x054c06bb, "WALKMAN NWZ-F805" },
@@ -11075,10 +11103,17 @@ static const value_string usb_products_vals[] = {
     { 0x056a03ac, "DTH-W1620 [MobileStudio Pro 16] touchscreen" },
     { 0x056a03b2, "DTH167 [Cintiq Pro 16] tablet" },
     { 0x056a03b3, "DTH167 [Cintiq Pro 16] touchscreen" },
+    { 0x056a03c0, "DTH271 [Cintiq Pro 27] touchscreen" },
+    { 0x056a03c4, "DTH172 [Cintiq Pro 17]" },
     { 0x056a03c5, "CTL-4100WL [Intuos BT (S)]" },
     { 0x056a03c7, "CTL-6100WL [Intuos BT (M)]" },
+    { 0x056a03cb, "DTH134 [Wacom One 13] touchscreen" },
+    { 0x056a03ce, "DTC121 [Wacom One 12] touchscreen" },
+    { 0x056a03d0, "DTH227 [Cintiq Pro 22]" },
     { 0x056a03dc, "PTH-460 [Intuos Pro (S)] tablet" },
     { 0x056a03dd, "PTH-460 [Intuos Pro BT (S)] tablet" },
+    { 0x056a03ec, "DTH134 [DTH134] touchscreen" },
+    { 0x056a03ed, "DTC121 [DTC121] touchscreen" },
     { 0x056a0400, "PenPartner 4x5" },
     { 0x056a4001, "TPC4001" },
     { 0x056a4004, "TPC4004" },
@@ -11095,19 +11130,22 @@ static const value_string usb_products_vals[] = {
     { 0x056d0002, "HID Monitor Controls" },
     { 0x056d0003, "Device Bay Controller" },
     { 0x056d4000, "FlexScan EV3237" },
-    { 0x056d4001, "Monitor" },
-    { 0x056d4002, "USB HID Monitor" },
+    { 0x056d4001, "FlexScan EV2450" },
+    { 0x056d4002, "FlexScan EV2455" },
     { 0x056d4014, "FlexScan EV2750" },
     { 0x056d4026, "FlexScan EV2451" },
     { 0x056d4027, "FlexScan EV2456" },
+    { 0x056d402b, "FlexScan EV2780" },
     { 0x056d4036, "FlexScan EV2785" },
     { 0x056d4037, "FlexScan EV3285" },
     { 0x056d4044, "FlexScan EV2457" },
     { 0x056d4059, "FlexScan EV2760" },
     { 0x056d405a, "FlexScan EV2360" },
     { 0x056d405b, "FlexScan EV2460" },
+    { 0x056d405e, "FlexScan EV2495" },
     { 0x056d405f, "FlexScan EV2795" },
     { 0x056d4065, "FlexScan EV3895" },
+    { 0x056d406a, "FlexScan EV2480" },
     { 0x056e0002, "29UO Mouse" },
     { 0x056e0057, "Micro Grast Pop M-PGDL" },
     { 0x056e005c, "Micro Grast Pop M-PG2DL" },
@@ -11831,6 +11869,7 @@ static const value_string usb_products_vals[] = {
     { 0x059f1093, "Rugged" },
     { 0x059f1094, "Rugged THB" },
     { 0x059f1095, "Rugged" },
+    { 0x059f1105, "Mobile Drive (RLSD: 2022)" },
     { 0x059fa601, "HardDrive" },
     { 0x059fa602, "CD R/W" },
     { 0x05a38388, "Marvell 88W8388 802.11a/b/g WLAN" },
@@ -12595,6 +12634,7 @@ static const value_string usb_products_vals[] = {
     { 0x05e3f12a, "Digital Microscope" },
     { 0x05e3fd21, "3M TL20 Temperature Logger" },
     { 0x05e3fe00, "Razer Mouse" },
+    { 0x05e63390, "3390 Arbitrary Waveform Generator" },
     { 0x05e90008, "KL5KUSB101B Ethernet [klsi]" },
     { 0x05e90009, "Sony 10Mbps Ethernet [pegasus]" },
     { 0x05e9000c, "USB-to-RS-232" },
@@ -12744,6 +12784,8 @@ static const value_string usb_products_vals[] = {
     { 0x06380a41, "Avision AM3000/MF3000 Series" },
     { 0x06380f01, "fi-4010CU" },
     { 0x06384004, "Minolta Dimage Scan Elite II AF-2920 (2888)" },
+    { 0x06397213, "CH7213" },
+    { 0x06397231, "CH7213" },
     { 0x06400026, "LPC-Stick" },
     { 0x06440000, "Floppy" },
     { 0x06440200, "All-In-One Multi-Card Reader CA200/B/S" },
@@ -13382,6 +13424,7 @@ static const value_string usb_products_vals[] = {
     { 0x06cb00bd, "Prometheus MIS Touch Fingerprint Reader" },
     { 0x06cb00c7, "TouchPad" },
     { 0x06cb00cb, "Fingerprint scanner" },
+    { 0x06cb00fc, "Prometheus Fingerprint Reader" },
     { 0x06cb0ac3, "Large Touch Screen" },
     { 0x06cb2970, "touchpad" },
     { 0x06cc0101, "Cable Modem" },
@@ -13436,7 +13479,9 @@ static const value_string usb_products_vals[] = {
     { 0x06d3038c, "CP900DW(ID) Port" },
     { 0x06d30393, "CP9500D/DW Port" },
     { 0x06d30394, "CP9000D/DW Port" },
+    { 0x06d30395, "CP9000DW" },
     { 0x06d30398, "P93D" },
+    { 0x06d3039e, "CP9500DW-S" },
     { 0x06d303a1, "CP9550D/DW Port" },
     { 0x06d303a5, "CP9550DW-S" },
     { 0x06d303a9, "CP-9600DW" },
@@ -13447,7 +13492,9 @@ static const value_string usb_products_vals[] = {
     { 0x06d30f10, "Hori/Namco FlightStick 2" },
     { 0x06d321ba, "FOMA D905i" },
     { 0x06d33b10, "P95D" },
+    { 0x06d33b20, "CP9820DW Series" },
     { 0x06d33b21, "CP-9810D/DW" },
+    { 0x06d33b2f, "LS9820A" },
     { 0x06d33b30, "CP-D70DW / CP-D707DW" },
     { 0x06d33b31, "CP-K60DW-S" },
     { 0x06d33b36, "CP-D80DW" },
@@ -14440,6 +14487,7 @@ static const value_string usb_products_vals[] = {
     { 0x07cec007, "DPB-4000" },
     { 0x07cec009, "DPB-6000" },
     { 0x07cec010, "CPB-7000" },
+    { 0x07cec011, "ASK-2500" },
     { 0x07cf1001, "QV-8000SX/5700/3000EX Digicam; Exilim EX-M20" },
     { 0x07cf1003, "Exilim EX-S500" },
     { 0x07cf1004, "Exilim EX-Z120" },
@@ -14549,8 +14597,11 @@ static const value_string usb_products_vals[] = {
     { 0x07fd0000, "FastLane MIDI Interface" },
     { 0x07fd0001, "MIDI Interface" },
     { 0x07fd0002, "MOTU Audio for 64 bit" },
-    { 0x07fd0004, "MicroBook" },
+    { 0x07fd0004, "Microbook I/II/IIc" },
     { 0x07fd0008, "M Series" },
+    { 0x07fd0009, "M Series (firmware update mode)" },
+    { 0x07fd000b, "M Series" },
+    { 0x07fd000d, "M Series (firmware update mode)" },
     { 0x07ff00ff, "Portable Hard Drive" },
     { 0x07ffffff, "Mad Catz Gamepad" },
     { 0x08010001, "Mini Swipe Reader (Keyboard Emulation)" },
@@ -14589,6 +14640,7 @@ static const value_string usb_products_vals[] = {
     { 0x081edf00, "Handheld" },
     { 0x081fe401, "gamepad" },
     { 0x08222001, "IRXpress Infrared Device" },
+    { 0x0828a003, "WS408 Label Printer" },
     { 0x082d0100, "Visor" },
     { 0x082d0200, "Treo" },
     { 0x082d0300, "Treo 600" },
@@ -15111,6 +15163,12 @@ static const value_string usb_products_vals[] = {
     { 0x090804b2, "NC interface" },
     { 0x090804b3, "keyboard front panel Cockpit" },
     { 0x090804b4, "SCR_CCID" },
+    { 0x090804b5, "Camera" },
+    { 0x090804b6, "Cockpit Touchkeypad" },
+    { 0x090804b7, "Cockpit Touchkeypad Bootloader" },
+    { 0x090804b8, "MediSET USB4-W" },
+    { 0x090804b9, "MediSET USB4-R" },
+    { 0x090804ba, "MediSET USB4-G" },
     { 0x09082701, "ShenZhen SANZHAI Technology Co.,Ltd Spy Pen VGA" },
     { 0x0909001b, "ATR2100-USB" },
     { 0x0909001c, "AT2020USB+" },
@@ -15125,6 +15183,7 @@ static const value_string usb_products_vals[] = {
     { 0x090c037c, "300k Pixel Camera" },
     { 0x090c1000, "Flash Drive" },
     { 0x090c1132, "5-in-1 Card Reader" },
+    { 0x090c2000, "Disk" },
     { 0x090c337b, "Silicon Motion Camera" },
     { 0x090c3710, "Silicon Motion Camera" },
     { 0x090c3720, "Silicon Motion Camera" },
@@ -15239,6 +15298,7 @@ static const value_string usb_products_vals[] = {
     { 0x091e50a1, "Garmin Forerunner 265" },
     { 0x091e50db, "Garmin Forerunner 965" },
     { 0x091e5116, "Garmin Fenix 7s pro sapphire solar" },
+    { 0x09205550, "U60 FT Network Interface" },
     { 0x09207500, "Network Interface" },
     { 0x09211001, "GoCOM232 Serial" },
     { 0x09220007, "LabelWriter 330" },
@@ -15439,6 +15499,7 @@ static const value_string usb_products_vals[] = {
     { 0x0944010f, "nanoKONTROL studio controller" },
     { 0x09440117, "nanoKONTROL2 MIDI Controller" },
     { 0x0944012f, "SQ-1" },
+    { 0x09440203, "KRONOS" },
     { 0x09440f03, "K-Series K61P MIDI studio controller" },
     { 0x09480301, "USB Pro (24/48)" },
     { 0x09480302, "USB Pro (24/96 playback)" },
@@ -15504,6 +15565,8 @@ static const value_string usb_products_vals[] = {
     { 0x09557140, "T124 [Tegra K1/Logan 32-bit]" },
     { 0x09557210, "SHIELD Controller" },
     { 0x09557321, "Switch [Tegra Erista] recovery mode" },
+    { 0x09557323, "T234 [Orin NX 16GB] recovery mode" },
+    { 0x09557423, "T234 [Orin NX 8GB] recovery mode" },
     { 0x09557721, "nVidia Jetson TX1" },
     { 0x09557820, "T20 [Tegra 2] recovery mode" },
     { 0x09557c18, "T186 [TX2 Tegra Parker] recovery mode" },
@@ -15516,13 +15579,18 @@ static const value_string usb_products_vals[] = {
     { 0x0955cf07, "nVidia Shield Tablet (MTP)" },
     { 0x0955cf08, "SHIELD Tablet" },
     { 0x0955cf09, "SHIELD Tablet" },
+    { 0x09570007, "82357A GPIB Interface Firmware loader" },
+    { 0x09570107, "82357A GPIB Interface" },
     { 0x09570200, "E-Video DC-350 Camera" },
     { 0x09570202, "E-Video DC-350 Camera" },
     { 0x09570407, "33220A Waveform Generator" },
-    { 0x09570518, "82357B GPIB Interface" },
+    { 0x09570518, "82357B GPIB Interface Firmware loader" },
+    { 0x09570607, "34410A Multimeter" },
+    { 0x09570718, "82357B GPIB Interface" },
     { 0x09570a07, "34411A Multimeter" },
     { 0x09571507, "33210A Waveform Generator" },
     { 0x09571745, "Test and Measurement Device (IVI)" },
+    { 0x09571907, "53230A Frequency Counter" },
     { 0x09571f01, "N5181A MXG Analog Signal Generator" },
     { 0x09572918, "U2702A oscilloscope" },
     { 0x0957fb18, "LC Device" },
@@ -15571,6 +15639,7 @@ static const value_string usb_products_vals[] = {
     { 0x099a6330, "SANWA Supply Inc. Slim Keyboard" },
     { 0x099a713a, "WK-713 Multimedia Keyboard" },
     { 0x099a7160, "Hyper Slim Keyboard" },
+    { 0x099a7202, "Enermax Aurora Micro Wireless Receiver" },
     { 0x09a68001, "Mass Storage Device" },
     { 0x09aa1000, "Prism GT 802.11b/g Adapter" },
     { 0x09aa3642, "Prism 2.x 802.11b Adapter" },
@@ -15628,12 +15697,15 @@ static const value_string usb_products_vals[] = {
     { 0x09d70100, "GPS/GNSS/SPAN sensor" },
     { 0x09d80320, "TWN3 Multi125" },
     { 0x09d80406, "TWN4 MIFARE NFC" },
+    { 0x09d80410, "TWN4 HID" },
+    { 0x09d80420, "TWN4 CDC" },
     { 0x09da0006, "Optical Mouse WOP-35 / Trust 450L Optical Mouse" },
     { 0x09da000a, "Optical Mouse Opto 510D / OP-620D" },
     { 0x09da000e, "X-F710F Optical Mouse 3xFire Gaming Mouse" },
     { 0x09da0018, "Trust Human Interface Device" },
     { 0x09da001a, "Wireless Mouse & RXM-15 Receiver" },
     { 0x09da002a, "Wireless Optical Mouse NB-30" },
+    { 0x09da0103, "Oscar X-710BK Gaming Mouse" },
     { 0x09da022b, "Wireless Mouse (Battery Free)" },
     { 0x09da024f, "RF Receiver and G6-20D Wireless Optical Mouse" },
     { 0x09da0260, "KV-300H Isolation Keyboard" },
@@ -15641,12 +15713,16 @@ static const value_string usb_products_vals[] = {
     { 0x09da09da, "Bloody V8 Mouse" },
     { 0x09da1068, "Bloody A90 Mouse" },
     { 0x09da112c, "Bloody V5 Mouse" },
+    { 0x09da2268, "Keyboard (FK11)" },
+    { 0x09da2690, "PK-635G" },
     { 0x09da3a60, "Bloody V8M Core 2 Mouse" },
     { 0x09da8090, "X-718BK Oscar Optical Gaming Mouse" },
     { 0x09da9033, "X-718BK Optical Mouse" },
     { 0x09da9066, "F3 V-Track Gaming Mouse" },
-    { 0x09da9090, "XL-730K / XL-750BK / XL-755BK Mice" },
+    { 0x09da9090, "XL-730K / XL-747H / XL-750BK / XL-755BK Mice" },
     { 0x09daf613, "Bloody V7M Mouse" },
+    { 0x09daf6cc, "B314 Light Strike Gaming Keyboard" },
+    { 0x09dafa44, "B930 Light Strike RGB Mechanical Gaming Keyboard" },
     { 0x09db0075, "MiniLab 1008" },
     { 0x09db0076, "PMD-1024" },
     { 0x09db007a, "PMD-1208LS" },
@@ -15654,11 +15730,13 @@ static const value_string usb_products_vals[] = {
     { 0x09db0082, "USB-1208FS" },
     { 0x09db0088, "USB-1616FS internal hub" },
     { 0x09e15121, "MicroLink dLAN" },
+    { 0x09e80029, "APC40 mkII" },
     { 0x09e80045, "MPK Mini Mk II MIDI Controller" },
     { 0x09e80062, "MPD16 MIDI Pad Controller Unit" },
     { 0x09e8006d, "EWI electronic wind instrument" },
     { 0x09e80071, "MPK25 MIDI Keyboard" },
     { 0x09e80076, "LPK25 MIDI Keyboard" },
+    { 0x09e8007c, "MPK Mini MIDI Controller" },
     { 0x09eb4331, "iRhythm Tuner Remote" },
     { 0x09ef0101, "MD-Port DG2 MiniDisc Interface" },
     { 0x09f30018, "GF-46 Multi-Mode Display Module" },
@@ -15702,6 +15780,9 @@ static const value_string usb_products_vals[] = {
     { 0x0a121010, "Bluetooth Device" },
     { 0x0a121011, "Bluetooth Device" },
     { 0x0a121012, "Bluetooth Device" },
+    { 0x0a121243, "CSRA64210 [TaoTronics Headset BH-22 in charging mode]" },
+    { 0x0a124007, "Mpow HC5 Headset in charging mode - HID / Mass Storage" },
+    { 0x0a124010, "Mpow HC5 Headset in charging mode - USB Hub" },
     { 0x0a12ffff, "USB Bluetooth Device in DFU State" },
     { 0x0a161111, "ThumbDrive" },
     { 0x0a168888, "IBM USB Memory Key" },
@@ -15835,6 +15916,7 @@ static const value_string usb_products_vals[] = {
     { 0x0a5c217f, "BCM2045B (BDC-2.1)" },
     { 0x0a5c2198, "Bluetooth 3.0 Device" },
     { 0x0a5c219b, "Bluetooth 2.1 Device" },
+    { 0x0a5c219c, "BCM2070 Bluetooth" },
     { 0x0a5c21b1, "HP Bluetooth Module" },
     { 0x0a5c21b4, "BCM2070 Bluetooth 2.1 + EDR" },
     { 0x0a5c21b9, "BCM2070 Bluetooth 2.1 + EDR" },
@@ -15858,6 +15940,7 @@ static const value_string usb_products_vals[] = {
     { 0x0a5c5802, "BCM5880 Secure Applications Processor with fingerprint touch sensor" },
     { 0x0a5c5803, "BCM5880 Secure Applications Processor with secure keyboard" },
     { 0x0a5c5804, "BCM5880 Secure Applications Processor with fingerprint swipe sensor" },
+    { 0x0a5c5832, "BCM5880 Secure Applications Processor Smartcard reader" },
     { 0x0a5c6300, "Pirelli Remote NDIS Device" },
     { 0x0a5c6410, "BCM20703A1 Bluetooth 4.1 + LE" },
     { 0x0a5cbd11, "BCM4320 802.11bg Wireless Adapter" },
@@ -23311,6 +23394,8 @@ static const value_string usb_products_vals[] = {
     { 0x20870b03, "Multi Touch Panel" },
     { 0x20a00006, "flirc" },
     { 0x20a04107, "GPF Crypto Stick V1.2" },
+    { 0x20a04108, "Nitrokey Pro" },
+    { 0x20a04109, "Nitrokey Storage" },
     { 0x20a04123, "IKALOGIC SCANALOGIC 2" },
     { 0x20a0414a, "MDE SPI Interface" },
     { 0x20a0415a, "OpenPilot" },
@@ -23319,7 +23404,16 @@ static const value_string usb_products_vals[] = {
     { 0x20a041e5, "BlinkStick" },
     { 0x20a04211, "Nitrokey Start" },
     { 0x20a04223, "ATSAMD21 [castAR]" },
+    { 0x20a04230, "Nitrokey HSM" },
+    { 0x20a04287, "Nitrokey FIDO U2F" },
     { 0x20a0428d, "Electrosense wideband converter" },
+    { 0x20a042b1, "Nitrokey FIDO2" },
+    { 0x20a042b2, "Nitrokey 3A Mini/3A NFC/3C NFC" },
+    { 0x20a042b4, "Nitrokey Pro Bootloader" },
+    { 0x20a042da, "MuteMe" },
+    { 0x20a042dd, "Nitrokey 3A NFC Bootloader/3C NFC Bootloader" },
+    { 0x20a042e8, "Nitrokey 3A Mini Bootloader" },
+    { 0x20a042ec, "RP2040 [PicoWifi]" },
     { 0x20b110ad, "XUSB Loader" },
     { 0x20b1f7d1, "XTAG2 - JTAG Adapter" },
     { 0x20b30a18, "10.1 Touch screen overlay" },
@@ -23950,7 +24044,7 @@ static const value_string usb_products_vals[] = {
     { 0x25784168, "2.4GHZ Wireless Arc Folding Mouse" },
     { 0x25811807, "Generic HID Smartcard" },
     { 0x25811808, "WinUSB Smartcard" },
-    { 0x2581f1d0, "FIDO U2F Security Key" },
+    { 0x2581f1d0, "Nitrokey U2F" },
     { 0x25a72410, "Laser mouse" },
     { 0x25a7fa23, "2.4G Receiver" },
     { 0x25a7fa61, "Elecom Co., Ltd MR-K013 Multicard Reader" },
@@ -24665,6 +24759,7 @@ static const value_string usb_products_vals[] = {
     { 0x33840000, "Thelio Io (thelio-io)" },
     { 0x33840001, "Launch Configurable Keyboard (launch_1)" },
     { 0x339b107d, "Honor X8/X9 5G" },
+    { 0x33a20136, "Olympus OM-1MarkII" },
     { 0x348f2322, "Wireless Presenter" },
     { 0x3504f110, "Security Key" },
     { 0x35380001, "Travel Flash" },