[Automatic update for 2018-03-25]

Update manuf, services enterprise numbers, translations, and other items.

Change-Id: Ie7d9f2b00222e5ed4e05b5c3fc9100ad26e65084
Reviewed-on: https://code.wireshark.org/review/26635
Reviewed-by: Gerald Combs <gerald@wireshark.org>

1 files changed, 98 insertions, 17 deletions

diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index b85b5dedcc..dc8de4954e 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -38,7 +38,9 @@ static const value_string usb_vendors_vals[] = {
     { 0x0004, "Nebraska Furniture Mart" },
     { 0x0011, "Unknown" },
     { 0x0053, "Planex" },
+    { 0x0078, "Microntek" },
     { 0x0079, "DragonRise Inc." },
+    { 0x0085, "Boeye Technology Co., Ltd." },
     { 0x0105, "Trust International B.V." },
     { 0x0127, "IBP" },
     { 0x0145, "Unknown" },
@@ -47,6 +49,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x0204, "Chipsbank Microelectronics Co., Ltd" },
     { 0x0218, "Hangzhou Worlde" },
     { 0x02ad, "HUMAX Co., Ltd." },
+    { 0x0303, "Mini Automation Controller" },
     { 0x0324, "OCZ Technology Inc" },
     { 0x0325, "OCZ Technology Inc" },
     { 0x0386, "LTS" },
@@ -3036,8 +3039,14 @@ static const value_string usb_products_vals[] = {
     { 0x00017778, "Counterfeit flash drive [Kingston]" },
     { 0x00117788, "counterfeit flash drive" },
     { 0x00535301, "GW-US54ZGL 802.11bg" },
+    { 0x00780006, "Joystick" },
     { 0x00790006, "PC TWIN SHOCK Gamepad" },
     { 0x00790011, "Gamepad" },
+    { 0x00791800, "Mayflash Wii U Pro Game Controller Adapter [DirectInput]" },
+    { 0x0079181b, "Venom Arcade Joystick" },
+    { 0x00791843, "Mayflash GameCube Controller Adapter" },
+    { 0x00791844, "Mayflash GameCube Controller" },
+    { 0x00850600, "eBook Reader" },
     { 0x0105145f, "NW-3100 802.11b/g 54Mbps Wireless Network Adapter [zd1211]" },
     { 0x01270002, "HDM Interface" },
     { 0x01270127, "ibp" },
@@ -3407,6 +3416,7 @@ static const value_string usb_products_vals[] = {
     { 0x03f02a1d, "Integrated Module with Bluetooth 2.1 Wireless technology" },
     { 0x03f02b11, "PSC 2170 series" },
     { 0x03f02b17, "LaserJet 1020" },
+    { 0x03f02b4a, "Business Slim Keyboard" },
     { 0x03f02c12, "Officejet J4680" },
     { 0x03f02c17, "LaserJet 1022" },
     { 0x03f02c24, "Logitech M-UAL-96 Mouse" },
@@ -3460,10 +3470,12 @@ static const value_string usb_products_vals[] = {
     { 0x03f03a02, "PhotoSmart 7150" },
     { 0x03f03a11, "OfficeJet 5500 series" },
     { 0x03f03a17, "Printing Support" },
+    { 0x03f03a1d, "hs2340 HSPA+ mobile broadband" },
     { 0x03f03b02, "PhotoSmart 7150~" },
     { 0x03f03b05, "Scanjet N8460" },
     { 0x03f03b11, "PSC 1300 series" },
     { 0x03f03b17, "LaserJet M1005 MFP" },
+    { 0x03f03b2a, "Color LaserJet MFP M277dw" },
     { 0x03f03c02, "PhotoSmart 7350" },
     { 0x03f03c05, "Scanjet Professional 1000 Mobile Scanner" },
     { 0x03f03c11, "PSC 1358" },
@@ -3781,8 +3793,12 @@ static const value_string usb_products_vals[] = {
     { 0x0403a951, "HCP HIT GSM/GPRS modem [Cinterion MC55i]" },
     { 0x0403a9a0, "FT2232D - Dual UART/FIFO IC - FTDI" },
     { 0x0403abb8, "Lego Mindstorms NXTCam" },
+    { 0x0403b0c0, "microSensys RFID device" },
+    { 0x0403b0c1, "microSensys RFID device" },
     { 0x0403b0c2, "iID contactless RFID device" },
     { 0x0403b0c3, "iID contactless RFID device" },
+    { 0x0403b0c4, "RFID device" },
+    { 0x0403b0c5, "RFID device" },
     { 0x0403b810, "US Interface Navigator (CAT and 2nd PTT lines)" },
     { 0x0403b811, "US Interface Navigator (WKEY and FSK lines)" },
     { 0x0403b812, "US Interface Navigator (RS232 and CONFIG lines)" },
@@ -4612,15 +4628,19 @@ static const value_string usb_products_vals[] = {
     { 0x04242602, "USB 2.0 Hub" },
     { 0x04242640, "USB 2.0 Hub" },
     { 0x04242660, "Hub" },
+    { 0x0424274d, "HTC Hub Controller" },
+    { 0x04243fcc, "RME MADIface" },
     { 0x04244041, "Hub and media card controller" },
     { 0x04244060, "Ultra Fast Media Reader" },
     { 0x04244064, "Ultra Fast Media Reader" },
     { 0x04245434, "Hub" },
     { 0x04245534, "Hub" },
     { 0x04247500, "LAN7500 Ethernet 10/100/1000 Adapter" },
+    { 0x04249500, "LAN9500/LAN9500i" },
     { 0x04249512, "SMC9512/9514 USB Hub" },
     { 0x04249514, "SMC9514 Hub" },
     { 0x04249904, "LAN9512/LAN9514 Ethernet 10/100 Adapter (SAL10)" },
+    { 0x04249e00, "LAN9500A/LAN9500Ai" },
     { 0x0424a700, "2 Port Hub" },
     { 0x0424ec00, "SMSC9512/9514 Fast Ethernet Adapter" },
     { 0x04250101, "G-Tech Wireless Mouse & Keyboard" },
@@ -4845,6 +4865,10 @@ static const value_string usb_products_vals[] = {
     { 0x044f0402, "HOTAS Warthog Joystick" },
     { 0x044f0404, "HOTAS Warthog Throttle" },
     { 0x044f044f, "GP XID" },
+    { 0x044f0f00, "Steering Wheel for Xbox" },
+    { 0x044f0f03, "Steering Wheel for Xbox" },
+    { 0x044f0f07, "Controller for Xbox" },
+    { 0x044f0f10, "Modena GT Wheel" },
     { 0x044fa003, "Rage 3D Game Pad" },
     { 0x044fa01b, "PK-GP301 Driving Wheel" },
     { 0x044fa0a0, "Top Gun Joystick" },
@@ -4862,6 +4886,7 @@ static const value_string usb_products_vals[] = {
     { 0x044fb315, "Firestorm Dual Analog 3" },
     { 0x044fb323, "Dual Trigger 3-in-1 (PC Mode)" },
     { 0x044fb324, "Dual Trigger 3-in-1 (PS3 Mode)" },
+    { 0x044fb326, "Gamepad GP XID" },
     { 0x044fb603, "force feedback Wheel" },
     { 0x044fb605, "force feedback Racing Wheel" },
     { 0x044fb651, "Ferrari GT Rumble Force Wheel" },
@@ -5149,15 +5174,17 @@ static const value_string usb_products_vals[] = {
     { 0x045e02ae, "Xbox NUI Camera" },
     { 0x045e02b0, "Xbox NUI Motor" },
     { 0x045e02b6, "Xbox360 Bluetooth Wireless Headset" },
+    { 0x045e02bb, "Kinect Audio" },
     { 0x045e02be, "Kinect for Windows NUI Audio" },
     { 0x045e02bf, "Kinect for Windows NUI Camera" },
     { 0x045e02c2, "Kinect for Windows NUI Motor" },
     { 0x045e02d1, "Xbox One Controller" },
     { 0x045e02d5, "Xbox One Digital TV Tuner" },
-    { 0x045e02dd, "Xbox One Controller (Covert Forces/Firmware 2015)" },
+    { 0x045e02dd, "Xbox One Controller (Firmware 2015)" },
     { 0x045e02e3, "Xbox One Elite Controller" },
     { 0x045e02e6, "Wireless XBox Controller Dongle" },
     { 0x045e02ea, "Xbox One S Controller" },
+    { 0x045e02fd, "Xbox One S Controller [Bluetooth]" },
     { 0x045e0400, "Windows Powered Pocket PC 2002" },
     { 0x045e0401, "Windows Powered Pocket PC 2002" },
     { 0x045e0402, "Windows Powered Pocket PC 2002" },
@@ -5405,7 +5432,7 @@ static const value_string usb_products_vals[] = {
     { 0x046a0010, "SmartBoard XX44" },
     { 0x046a0011, "G83 (RS 6000) Keyboard" },
     { 0x046a0021, "CyMotion Expert Combo" },
-    { 0x046a0023, "CyMotion Master Linux Keyboard G230" },
+    { 0x046a0023, "Keyboard" },
     { 0x046a0027, "CyMotion Master Solar Keyboard" },
     { 0x046a002a, "Wireless Mouse & Keyboard" },
     { 0x046a002d, "SmartTerminal XX44" },
@@ -5415,6 +5442,7 @@ static const value_string usb_products_vals[] = {
     { 0x046a0041, "G86 6240 Keyboard" },
     { 0x046a0080, "eHealth Terminal ST 1503" },
     { 0x046a0081, "eHealth Keyboard G87 1504" },
+    { 0x046a00a1, "SmartCard Reader Keyboard KC 1000 SC" },
     { 0x046a0106, "R-300 Wireless Mouse Receiver" },
     { 0x046a010d, "MX-Board 3.0 Keyboard" },
     { 0x046ab090, "Keyboard" },
@@ -5427,6 +5455,7 @@ static const value_string usb_products_vals[] = {
     { 0x046d0082, "Acer Aspire 5672 Webcam" },
     { 0x046d0200, "WingMan Extreme Joystick" },
     { 0x046d0203, "M2452 Keyboard" },
+    { 0x046d0242, "Chillstream for Xbox 360" },
     { 0x046d0301, "M4848 Mouse" },
     { 0x046d0401, "HP PageScan" },
     { 0x046d0402, "NEC PageScan" },
@@ -5447,6 +5476,7 @@ static const value_string usb_products_vals[] = {
     { 0x046d081d, "HD Webcam C510" },
     { 0x046d0820, "QuickCam VC" },
     { 0x046d0821, "HD Webcam C910" },
+    { 0x046d0823, "HD Webcam B910" },
     { 0x046d0825, "Webcam C270" },
     { 0x046d0826, "HD Webcam C525" },
     { 0x046d0828, "HD Webcam B990" },
@@ -5672,9 +5702,9 @@ static const value_string usb_products_vals[] = {
     { 0x046dc213, "J-UH16 (Freedom 2.4 Cordless Joystick)" },
     { 0x046dc214, "ATK3 (Attack III Joystick)" },
     { 0x046dc215, "Extreme 3D Pro" },
-    { 0x046dc216, "Dual Action Gamepad" },
-    { 0x046dc218, "Logitech RumblePad 2 USB" },
-    { 0x046dc219, "Cordless RumblePad 2" },
+    { 0x046dc216, "F310 Gamepad [DirectInput Mode]" },
+    { 0x046dc218, "F510 Gamepad [DirectInput Mode]" },
+    { 0x046dc219, "F710 Gamepad [DirectInput Mode]" },
     { 0x046dc21a, "Precision Gamepad" },
     { 0x046dc21c, "G13 Advanced Gameboard" },
     { 0x046dc21d, "F310 Gamepad [XInput Mode]" },
@@ -5816,8 +5846,13 @@ static const value_string usb_products_vals[] = {
     { 0x046dc720, "Bluetooth wireless hub" },
     { 0x046dca03, "MOMO Racing" },
     { 0x046dca04, "Formula Vibration Feedback Wheel" },
+    { 0x046dca84, "Cordless Controller for Xbox" },
+    { 0x046dca88, "Thunderpad for Xbox" },
+    { 0x046dca8a, "Precision Vibration Feedback Wheel for Xbox" },
+    { 0x046dcaa3, "DriveFX Racing Wheel" },
     { 0x046dcab1, "Cordless Keyboard for Wii HID Receiver" },
     { 0x046dd001, "QuickCam Pro" },
+    { 0x046df301, "Controller" },
     { 0x046e0100, "Keyboard" },
     { 0x046e3001, "Mass Storage Device" },
     { 0x046e3002, "Mass Storage Device" },
@@ -6103,6 +6138,7 @@ static const value_string usb_products_vals[] = {
     { 0x04820203, "AH-K3001V" },
     { 0x04820204, "iBurst Terminal" },
     { 0x04820408, "FS-1320D Printer" },
+    { 0x04820640, "ECOSYS M6026cdn" },
     { 0x0482069b, "ECOSYS M2635dn" },
     { 0x04830137, "BeWAN ADSL USB ST (blue or green)" },
     { 0x04830138, "Unicorn II (ST70138B + MTC-20174TQ chipset)" },
@@ -6122,13 +6158,18 @@ static const value_string usb_products_vals[] = {
     { 0x04835000, "ST Micro/Ergenic ERG BT-002 Bluetooth Adapter" },
     { 0x04835001, "ST Micro Bluetooth Device" },
     { 0x04835710, "Joystick in FS Mode" },
-    { 0x04835720, "STM microSD Flash Device" },
+    { 0x04835720, "Mass Storage Device" },
     { 0x04835721, "Hantek DDS-3X25 Arbitrary Waveform Generator" },
-    { 0x04835730, "STM32 Audio Streaming" },
-    { 0x04835740, "STM32F407" },
+    { 0x04835722, "Bulk Demo" },
+    { 0x04835730, "Audio Speaker" },
+    { 0x04835731, "Microphone" },
+    { 0x04835740, "Virtual COM Port" },
     { 0x04837270, "ST Micro Serial Bridge" },
     { 0x04837554, "56k SoftModem" },
+    { 0x04838213, "ThermaData Logger Cradle" },
+    { 0x04838259, "Probe" },
     { 0x048391d1, "Sensor Hub" },
+    { 0x0483a171, "ThermaData WiFi" },
     { 0x0483df11, "STM Device in DFU Mode" },
     { 0x0483ff10, "Swann ST56 Modem" },
     { 0x04860185, "EeePC T91MT HID Touch Panel" },
@@ -6147,6 +6188,7 @@ static const value_string usb_products_vals[] = {
     { 0x0489e040, "Vizio VTAB1008" },
     { 0x0489e042, "Broadcom BCM20702 Bluetooth" },
     { 0x0489e04d, "Atheros AR3012 Bluetooth" },
+    { 0x0489e055, "BCM43142A0 broadcom bluetooth" },
     { 0x048d1165, "IT1165 Flash Controller" },
     { 0x048d1172, "Flash Drive" },
     { 0x048d1336, "SD/MMC Cardreader" },
@@ -6475,6 +6517,7 @@ static const value_string usb_products_vals[] = {
     { 0x04a91607, "DR-6080 Scanner" },
     { 0x04a91608, "DR-2580C Scanner" },
     { 0x04a91609, "DR-3080CII" },
+    { 0x04a9160a, "DR-2050C Scanner" },
     { 0x04a91700, "PIXMA MP110 Scanner" },
     { 0x04a91701, "PIXMA MP130 Scanner" },
     { 0x04a91702, "MP410 Composite" },
@@ -6638,11 +6681,14 @@ static const value_string usb_products_vals[] = {
     { 0x04a92623, "FAX-B180C" },
     { 0x04a92629, "FAXPHONE L75" },
     { 0x04a9262b, "LaserShot LBP-1120 Printer" },
+    { 0x04a9262c, "imageCLASS D300" },
     { 0x04a9262d, "iR C3200" },
     { 0x04a9262f, "PIXMA MP730" },
     { 0x04a92630, "PIXMA MP700" },
     { 0x04a92631, "LASER CLASS 700" },
     { 0x04a92632, "FAX-L2000" },
+    { 0x04a92633, "LASERCLASS 500" },
+    { 0x04a92634, "PC-D300/FAX-L400/ICD300" },
     { 0x04a92635, "MPC190" },
     { 0x04a92637, "iR C6800" },
     { 0x04a92638, "iR C3100" },
@@ -6697,6 +6743,7 @@ static const value_string usb_products_vals[] = {
     { 0x04a92687, "iR4530" },
     { 0x04a92688, "LBP3460" },
     { 0x04a92689, "FAX-L180/L380S/L398S" },
+    { 0x04a9268a, "LC310/L390/L408S" },
     { 0x04a9268c, "iR C6870" },
     { 0x04a9268d, "iR 6870C EUR" },
     { 0x04a9268e, "iR C5870" },
@@ -7035,6 +7082,7 @@ static const value_string usb_products_vals[] = {
     { 0x04a932c1, "PowerShot ELPH 180 / IXUS 175" },
     { 0x04a932c2, "PowerShot SX720 HS" },
     { 0x04a932d5, "PowerShot SX430 IS" },
+    { 0x04a932db, "SELPHY CP1300" },
     { 0x04ad2501, "Bluetooth Device" },
     { 0x04b00102, "Coolpix 990" },
     { 0x04b00103, "Coolpix 880" },
@@ -7230,6 +7278,8 @@ static const value_string usb_products_vals[] = {
     { 0x04b45500, "HID->COM RS232 Adapter" },
     { 0x04b45a9b, "Dacal CD/DVD Library D-101/DC-300/DC-016RW" },
     { 0x04b46370, "ViewMate Desktop Mouse CC2201" },
+    { 0x04b46502, "CY4609" },
+    { 0x04b46506, "CY4603" },
     { 0x04b46560, "CY7C65640 USB-2.0 \"TetraHub\"" },
     { 0x04b46830, "CY7C68300A EZ-USB AT2 USB 2.0 to ATA/ATAPI" },
     { 0x04b46831, "Storage Adapter ISD-300LP (CY)" },
@@ -7247,6 +7297,7 @@ static const value_string usb_products_vals[] = {
     { 0x04b4f000, "CY30700 Licorice evaluation board" },
     { 0x04b4f111, "CY8CKIT-002 PSoC MiniProg3 Rev A Program and debug kit" },
     { 0x04b4f115, "PSoC FirstTouch Programmer" },
+    { 0x04b4f231, "DELLY Changer 4in1 universal IR remote" },
     { 0x04b4f232, "Mono embedded computer" },
     { 0x04b4fd13, "Programmable power socket" },
     { 0x04b53064, "Hantek DSO-3064" },
@@ -7553,6 +7604,7 @@ static const value_string usb_products_vals[] = {
     { 0x04ca300d, "Atheros AR3012 Bluetooth" },
     { 0x04ca300f, "Atheros AR3012 Bluetooth" },
     { 0x04ca3014, "Qualcomm Atheros Bluetooth" },
+    { 0x04ca7022, "HP HD Webcam" },
     { 0x04ca7025, "HP HD Webcam" },
     { 0x04ca7046, "TOSHIBA Web Camera - HD" },
     { 0x04ca9304, "Hub" },
@@ -7564,7 +7616,7 @@ static const value_string usb_products_vals[] = {
     { 0x04cb0109, "FinePix F601 Zoom (PC CAM)" },
     { 0x04cb010a, "FinePix S602 (Pro) Zoom (DSC)" },
     { 0x04cb010b, "FinePix S602 (Pro) Zoom (PC CAM)" },
-    { 0x04cb010d, "FinePix Digital Camera 020531" },
+    { 0x04cb010d, "FinePix S2 pro" },
     { 0x04cb010e, "FinePix F402 Zoom (DSC)" },
     { 0x04cb010f, "FinePix F402 Zoom (PC CAM)" },
     { 0x04cb0110, "FinePix M603 Zoom (DSC)" },
@@ -7714,6 +7766,7 @@ static const value_string usb_products_vals[] = {
     { 0x04d88108, "ChipKit Pro MX7 (PIC32MX)" },
     { 0x04d89004, "Microchip REAL ICE" },
     { 0x04d8900a, "PICkit3" },
+    { 0x04d89012, "PICkit4" },
     { 0x04d8c001, "PicoLCD 20x4" },
     { 0x04d8e11c, "TL866CS EEPROM Programmer [MiniPRO]" },
     { 0x04d8f2c4, "Macareux-labs Hygrometry Temperature Sensor" },
@@ -7753,6 +7806,7 @@ static const value_string usb_products_vals[] = {
     { 0x04d92834, "HT82A834R Audio MCU" },
     { 0x04d9a01c, "wireless multimedia keyboard with trackball [Trust ADURA 17911]" },
     { 0x04d9a050, "Chatman V1" },
+    { 0x04d9a052, "USB-zyTemp" },
     { 0x04d9a055, "Keyboard" },
     { 0x04d9a096, "Keyboard" },
     { 0x04d9a09f, "E-Signal LUOM G10 Mechanical Gaming Mouse" },
@@ -7979,6 +8033,7 @@ static const value_string usb_products_vals[] = {
     { 0x04e83268, "ML-1610 Mono Laser Printer" },
     { 0x04e8326c, "ML-2010P Mono Laser Printer" },
     { 0x04e83276, "ML-3050/ML-3051 Laser Printer" },
+    { 0x04e8327e, "ML-2510 Series" },
     { 0x04e8328e, "CLP-310 Color Laser Printer" },
     { 0x04e83292, "ML-1640 Series Laser Printer" },
     { 0x04e83296, "ML-2580N Mono Laser Printer" },
@@ -8106,6 +8161,7 @@ static const value_string usb_products_vals[] = {
     { 0x04e861b5, "M3 Portable Hard Drive 2TB" },
     { 0x04e861b6, "M3 Portable Hard Drive 1TB" },
     { 0x04e861f3, "Portable SSD T3 (MU-PT250B, MU-PT500B)" },
+    { 0x04e861f5, "Portable SSD T5" },
     { 0x04e86601, "Mobile Phone" },
     { 0x04e86602, "Galaxy" },
     { 0x04e86603, "Galaxy" },
@@ -8207,6 +8263,7 @@ static const value_string usb_products_vals[] = {
     { 0x04f20618, "RG-0618U Wireless HID Receiver & KG-0609 Wireless Keyboard with Touchpad" },
     { 0x04f20718, "wired mouse" },
     { 0x04f20760, "Acer KU-0760 Keyboard" },
+    { 0x04f20833, "KU-0833 Keyboard" },
     { 0x04f20841, "HP Multimedia Keyboard" },
     { 0x04f20860, "2.4G Multimedia Wireless Kit" },
     { 0x04f21061, "HP KG-1061 Wireless Keyboard+Mouse" },
@@ -8259,6 +8316,7 @@ static const value_string usb_products_vals[] = {
     { 0x04f2b15c, "Sony Vaio Integrated Camera" },
     { 0x04f2b175, "4-Port Hub" },
     { 0x04f2b1aa, "Webcam-101" },
+    { 0x04f2b1ac, "HP Laptop Integrated Webcam [2 MP Fixed]" },
     { 0x04f2b1b4, "Lenovo Integrated Camera" },
     { 0x04f2b1b9, "Asus Integrated Webcam" },
     { 0x04f2b1cf, "Lenovo Integrated Camera" },
@@ -8275,7 +8333,9 @@ static const value_string usb_products_vals[] = {
     { 0x04f2b2b0, "Camera" },
     { 0x04f2b2b9, "Lenovo Integrated Camera UVC" },
     { 0x04f2b2da, "thinkpad t430s camera" },
+    { 0x04f2b2db, "Thinkpad T430 camera" },
     { 0x04f2b2ea, "Integrated Camera [ThinkPad]" },
+    { 0x04f2b2f4, "HP Webcam-50" },
     { 0x04f2b330, "Asus 720p CMOS webcam" },
     { 0x04f2b354, "UVC 1.00 device HD UVC WebCam" },
     { 0x04f2b394, "Integrated Camera" },
@@ -8284,6 +8344,8 @@ static const value_string usb_products_vals[] = {
     { 0x04f2b3fd, "HD WebCam (Asus N-series)" },
     { 0x04f2b40e, "HP Truevision HD camera" },
     { 0x04f2b444, "Lenovo Integrated Webcam" },
+    { 0x04f2b5ce, "Integrated Camera" },
+    { 0x04f2b5cf, "Integrated IR Camera" },
     { 0x04f3000a, "Touchscreen" },
     { 0x04f30103, "ActiveJet K-2024 Multimedia Keyboard" },
     { 0x04f3016f, "Touchscreen" },
@@ -8295,6 +8357,7 @@ static const value_string usb_products_vals[] = {
     { 0x04f30230, "3D Optical Mouse" },
     { 0x04f30232, "Mouse" },
     { 0x04f30234, "Optical Mouse" },
+    { 0x04f30235, "Optical Mouse" },
     { 0x04f302f4, "2.4G Cordless Mouse" },
     { 0x04f30381, "Touchscreen" },
     { 0x04f304a0, "Dream Cheeky Stress/Panic Button" },
@@ -9016,7 +9079,7 @@ static const value_string usb_products_vals[] = {
     { 0x0525a4a2, "Linux-USB Ethernet/RNDIS Gadget" },
     { 0x0525a4a3, "Linux-USB user-mode isochronous source/sink" },
     { 0x0525a4a4, "Linux-USB user-mode bulk source/sink" },
-    { 0x0525a4a5, "Pocketbook Pro 903" },
+    { 0x0525a4a5, "Pocketbook Pro 903 / Mobius 2 Action Cam" },
     { 0x0525a4a6, "Linux-USB Serial Gadget" },
     { 0x0525a4a7, "Linux-USB Serial Gadget (CDC ACM mode)" },
     { 0x0525a4a8, "Linux-USB Printer Gadget" },
@@ -9125,7 +9188,7 @@ static const value_string usb_products_vals[] = {
     { 0x05481005, "EZ Cart II GameBoy Flash Programmer" },
     { 0x054c0001, "HUB" },
     { 0x054c0002, "Standard HUB" },
-    { 0x054c0010, "DSC-S30/S70/S75/F505V/F505/FD92/W1 Cybershot/Mavica Digital Camera" },
+    { 0x054c0010, "Cyber-shot, Mavica (msc)" },
     { 0x054c0014, "Nogatech USBVision (SY)" },
     { 0x054c0022, "Storage Adapter V2 (TPP)" },
     { 0x054c0023, "CD Writer" },
@@ -9332,18 +9395,20 @@ static const value_string usb_products_vals[] = {
     { 0x054c05a8, "Sony NWZ-S765" },
     { 0x054c05b3, "Sony Sony Tablet S" },
     { 0x054c05b4, "Sony Sony Tablet S1" },
-    { 0x054c05c4, "DualShock 4 [CUH-ZCT1E]" },
+    { 0x054c05c4, "DualShock 4 [CUH-ZCT1x]" },
     { 0x054c061f, "Sony DSC-HX200V" },
     { 0x054c0689, "Walkman NWZ-B173F" },
     { 0x054c06bb, "WALKMAN NWZ-F805" },
     { 0x054c06c3, "RC-S380" },
     { 0x054c07c4, "ILCE-6000 (aka Alpha-6000) in Mass Storage mode" },
+    { 0x054c082f, "Walkman NWZW Series" },
     { 0x054c0847, "WG-C10 Portable Wireless Server" },
     { 0x054c088c, "Portable Headphone Amplifier" },
     { 0x054c08b7, "ILCE-6000 (aka Alpha-6000) in MTP mode" },
     { 0x054c094e, "ILCE-6000 (aka Alpha-6000) in PC Remote mode" },
     { 0x054c0994, "ILCE-6000 (aka Alpha-6000) in charging mode" },
-    { 0x054c09cc, "DualShock 4 [CUH-ZCT2E]" },
+    { 0x054c09cc, "DualShock 4 [CUH-ZCT2x]" },
+    { 0x054c0ba0, "Dualshock4 Wireless Adaptor" },
     { 0x054c0bb5, "Headset MDR-1000X" },
     { 0x054c1000, "Wireless Buzz! Receiver" },
     { 0x054c1294, "Sony DCR-SR75" },
@@ -9431,6 +9496,7 @@ static const value_string usb_products_vals[] = {
     { 0x055f0408, "BearPaw 2448 CU Pro" },
     { 0x055f0409, "BearPaw 2448 TA Pro" },
     { 0x055f040b, "ScanExpress A3 USB 1200 PRO" },
+    { 0x055f0501, "ScanExpress A3 2400 Pro" },
     { 0x055f0873, "ScanExpress 600 USB" },
     { 0x055f1000, "BearPaw 4800 TA Pro" },
     { 0x055fa350, "gSmart 350 Camera" },
@@ -9612,12 +9678,26 @@ static const value_string usb_products_vals[] = {
     { 0x056a034e, "DTH-W1620 [MobileStudio Pro 16] tablet" },
     { 0x056a034f, "DTH-1320 [Cintiq Pro 13] tablet" },
     { 0x056a0350, "DTH-1620 [Cintiq Pro 16] tablet" },
+    { 0x056a0351, "DTH-2420 [Cintiq Pro 24 PT] tablet" },
+    { 0x056a0352, "DTH-3220 [Cintiq Pro 32] tablet" },
     { 0x056a0353, "DTH-1320 [Cintiq Pro 13] touchscreen" },
     { 0x056a0354, "DTH-1620 [Cintiq Pro 16] touchscreen" },
+    { 0x056a0355, "DTH-2420 [Cintiq Pro 24 PT] touchscreen" },
+    { 0x056a0356, "DTH-3220 [Cintiq Pro 32] touchscreen" },
     { 0x056a0357, "PTH-660 [Intuos Pro (M)]" },
     { 0x056a0358, "PTH-860 [Intuos Pro (L)]" },
     { 0x056a035a, "DTH-1152 tablet" },
     { 0x056a0368, "DTH-1152 touchscreen" },
+    { 0x056a0374, "CTL-4100 [Intuos (S)]" },
+    { 0x056a0375, "CTL-6100 [Intuos (M)]" },
+    { 0x056a0376, "CTL-4100WL [Intuos BT (S)]" },
+    { 0x056a0378, "CTL-6100WL [Intuos BT (M)]" },
+    { 0x056a037a, "CTL-472 [One by Wacom (S)]" },
+    { 0x056a037b, "CTL-672 [One by Wacom (M)]" },
+    { 0x056a037c, "DTK-2420 [Cintiq Pro 24 P]" },
+    { 0x056a037d, "DTH-2452 tablet" },
+    { 0x056a037e, "DTH-2452 touchscreen" },
+    { 0x056a0382, "DTK-2451 tablet" },
     { 0x056a0400, "PenPartner 4x5" },
     { 0x056a4001, "TPC4001" },
     { 0x056a4004, "TPC4004" },
@@ -19146,10 +19226,11 @@ static const value_string usb_products_vals[] = {
     { 0x20df0001, "Entropy Key [UDEKEY01]" },
     { 0x20f10101, "iCube3 Camera" },
     { 0x20f4648b, "TEW-648UBM 802.11n 150Mbps Micro Wireless N Adapter [Realtek RTL8188CUS]" },
-    { 0x20f73001, "Camera with CMOS sensor [MQ]" },
-    { 0x20f73021, "Camera with CCD sensor [MD]" },
-    { 0x20f730b3, "Camera with CMOS sensor in Vision mode [MQ]" },
-    { 0x20f7a003, "Subminiature 5Mpix B/W Camera, MU9PM-MH" },
+    { 0x20f73001, "MQ or MD camera" },
+    { 0x20f73002, "MU camera" },
+    { 0x20f73021, "MJ camera" },
+    { 0x20f730b3, "MQ in U3V mode or MC camera" },
+    { 0x20f7a003, "MU camera" },
     { 0x21009e52, "Yaesu VX-7" },
     { 0x21009e54, "CT29B Radio Cable" },
     { 0x21009e57, "RTS01 Radio Cable" },