[Automatic manuf, services and enterprise-numbers update for 2014-12-14]

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

1 files changed, 175 insertions, 19 deletions

diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 9e882bd3fd..b0117a7deb 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -551,7 +551,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x05f7, "RFC Distribution(s) PTE, Ltd" },
     { 0x05f9, "PSC Scanning, Inc." },
     { 0x05fa, "Siemens Telecommunications Systems, Ltd" },
-    { 0x05fc, "Harman Multimedia" },
+    { 0x05fc, "Harman" },
     { 0x05fd, "InterAct, Inc." },
     { 0x05fe, "Chic Technology Corp." },
     { 0x05ff, "LeCroy Corp." },
@@ -1160,6 +1160,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x09c3, "ActivCard, Inc." },
     { 0x09c4, "ACTiSYS Corp." },
     { 0x09c5, "Memory Corp." },
+    { 0x09ca, "BMC Messsysteme GmbH" },
     { 0x09cc, "Workbit Corp." },
     { 0x09cd, "Psion Dacom Home Networks, Ltd" },
     { 0x09ce, "City Electronics, Ltd" },
@@ -1733,6 +1734,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x0e08, "Winbest Technology Co., Ltd" },
     { 0x0e0b, "Amigo Technology Inc." },
     { 0x0e0c, "Gesytec" },
+    { 0x0e0d, "PicoQuant GmbH" },
     { 0x0e0f, "VMware, Inc." },
     { 0x0e16, "JMTek, LLC" },
     { 0x0e17, "Walex Electronic, Ltd" },
@@ -2182,6 +2184,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x12b8, "Zhejiang Xinya Electronic Technology Co., Ltd." },
     { 0x12b9, "E28" },
     { 0x12ba, "Licensed by Sony Computer Entertainment America" },
+    { 0x12bd, "Gembird" },
     { 0x12c4, "Autocue Group Ltd" },
     { 0x12cf, "DEXIN" },
     { 0x12d1, "Huawei Technologies Co., Ltd." },
@@ -2212,8 +2215,10 @@ static const value_string usb_vendors_vals[] = {
     { 0x134c, "PanJit International Inc." },
     { 0x134e, "Digby's Bitpile, Inc. DBA D Bit" },
     { 0x1357, "P&E Microcomputer Systems" },
+    { 0x135f, "Control Development Inc." },
     { 0x1366, "SEGGER" },
     { 0x136b, "STEC" },
+    { 0x136e, "Andor Technology Ltd." },
     { 0x1370, "Swissbit" },
     { 0x1371, "CNet Technology Inc." },
     { 0x1376, "Vimtron Electronics Co., Ltd." },
@@ -2239,6 +2244,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x13d1, "A-Max Technology Macao Commercial Offshore Co. Ltd." },
     { 0x13d2, "Shark Multimedia" },
     { 0x13d3, "IMC Networks" },
+    { 0x13d7, "Guidance Software, Inc." },
     { 0x13dc, "ALEREON, INC." },
     { 0x13dd, "i.Tech Dynamic Limited" },
     { 0x13e1, "Kaibo Wire & Cable (Shenzhen) Co., Ltd." },
@@ -2840,6 +2846,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x27b8, "ThingM" },
     { 0x2821, "ASUSTek Computer Inc." },
     { 0x2899, "Toptronic Industrial Co., Ltd" },
+    { 0x2931, "Jolla Oy" },
     { 0x2c02, "Planex Communications" },
     { 0x2c1a, "Dolphin Peripherals" },
     { 0x2fb2, "Fujitsu, Ltd" },
@@ -5594,6 +5601,7 @@ static const value_string usb_products_vals[] = {
     { 0x046e5308, "KeyMaestro Keyboard" },
     { 0x046e5408, "KeyMaestro Multimedia Keyboard/Hub" },
     { 0x046e5500, "Portable Keyboard 86+9 keys (Model 6100C US)" },
+    { 0x046e5550, "5 button optical mouse model M873U" },
     { 0x046e5720, "Smart Card Reader" },
     { 0x046e6782, "BTC 7932 mouse+keyboard" },
     { 0x04710101, "DSS350 Digital Speaker System" },
@@ -8837,6 +8845,7 @@ static const value_string usb_products_vals[] = {
     { 0x05728390, "WinFast PalmTop/Novo TV Video" },
     { 0x05728392, "WinFast PalmTop/Novo TV Video" },
     { 0x0572960c, "DVBSky S960C DVB-S2 tuner" },
+    { 0x0572c686, "Geniatech T220A DVB-T2 TV Stick" },
     { 0x0572c688, "Geniatech T230 DVB-T2 TV Stick" },
     { 0x0572cafc, "CX861xx ROM Boot Loader" },
     { 0x0572cafe, "AccessRunner ADSL Modem" },
@@ -9924,6 +9933,7 @@ static const value_string usb_products_vals[] = {
     { 0x05e00700, "Bar Code Scanner (CS1504)" },
     { 0x05e00800, "Spectrum24 Wireless LAN Adapter" },
     { 0x05e01200, "Bar Code Scanner" },
+    { 0x05e01701, "Bar Code Scanner (CDC)" },
     { 0x05e01900, "SNAPI Imaging Device" },
     { 0x05e02000, "MC3090 Rugged Mobile Computer" },
     { 0x05e0200d, "MC70 Rugged Mobile Computer" },
@@ -10026,15 +10036,18 @@ static const value_string usb_products_vals[] = {
     { 0x05f30261, "X-Keys Switch Interface, SPLAT Mode" },
     { 0x05f30264, "X-Keys Switch Interface, Composite Mode" },
     { 0x05f91104, "Magellan 2200VS" },
+    { 0x05f91206, "Gryphon series (OEM mode)" },
     { 0x05f92202, "Point of Sale Handheld Scanner" },
-    { 0x05f92206, "Datalogic Gryphon GFS4170" },
-    { 0x05f92601, "Datalogin Magellan 1000i Barcode Scanner" },
+    { 0x05f92206, "Gryphon series (keyboard emulation mode)" },
+    { 0x05f9220c, "Datalogic Gryphon GD4430" },
+    { 0x05f92601, "Datalogic Magellan 1000i Barcode Scanner" },
     { 0x05f92602, "Datalogic Magellan 1100i Barcode Scanner" },
-    { 0x05f94204, "Datalogic Gryphon GFS4470 Fixed Scanner" },
+    { 0x05f94204, "Gryphon series (RS-232 emulation mode)" },
     { 0x05f95204, "Datalogic Gryphon GFS4170 (config mode)" },
     { 0x05fa3301, "Keyboard with PS/2 Mouse Port" },
     { 0x05fa3302, "Keyboard" },
     { 0x05fa3303, "Keyboard with PS/2 Mouse Port" },
+    { 0x05fc0001, "Soundcraft Si Multi Digital Card" },
     { 0x05fc7849, "Harman/Kardon SoundSticks" },
     { 0x05fd0239, "SV-239 HammerHead Digital" },
     { 0x05fd0251, "Raider Pro" },
@@ -10055,7 +10068,7 @@ static const value_string usb_products_vals[] = {
     { 0x05fe2001, "Microsoft Wireless Receiver 700" },
     { 0x06010003, "Internet Security Co., Ltd. SecureKey" },
     { 0x06021001, "ViCam Webcam" },
-    { 0x060300f1, "Keyboard" },
+    { 0x060300f1, "Keyboard (Labtec Ultra Flat Keyboard)" },
     { 0x060300f2, "Keyboard (Labtec Ultra Flat Keyboard)" },
     { 0x06036871, "Mouse" },
     { 0x0609031d, "eHome Infrared Receiver" },
@@ -10108,6 +10121,7 @@ static const value_string usb_products_vals[] = {
     { 0x062a0201, "Defender Office Keyboard (K7310) S Zodiak KM-9010" },
     { 0x062a0252, "Emerge Uni-retractable Laser Mouse" },
     { 0x062a3286, "Nano Receiver [Sandstrom Laser Mouse SMWLL11]" },
+    { 0x062a4101, "Wireless Keyboard/Mouse" },
     { 0x062a6301, "Trust Wireless Optical Mouse MI-4150K" },
     { 0x062a9003, "VoIP Conference Hub (A16GH)" },
     { 0x062a9004, "USR9602 USB Internet Mini Phone" },
@@ -10129,7 +10143,7 @@ static const value_string usb_products_vals[] = {
     { 0x06441000, "CD-ROM Drive" },
     { 0x0644800d, "TASCAM Portastudio DP-01FX" },
     { 0x0644800e, "TASCAM US-122L" },
-    { 0x0644801d, "DR-100" },
+    { 0x0644801d, "TASCAM DR-100" },
     { 0x06448021, "TASCAM US-122mkII" },
     { 0x0644d001, "CD-R/RW Unit" },
     { 0x0644d002, "CD-R/RW Unit" },
@@ -10630,6 +10644,7 @@ static const value_string usb_products_vals[] = {
     { 0x06c90005, "Monitor Control" },
     { 0x06c90007, "Monitor Control" },
     { 0x06c90009, "Monitor Control" },
+    { 0x06ca2003, "uSCSI" },
     { 0x06cb0001, "TouchPad" },
     { 0x06cb0002, "Integrated TouchPad" },
     { 0x06cb0003, "cPad" },
@@ -10641,6 +10656,7 @@ static const value_string usb_products_vals[] = {
     { 0x06cb000e, "HID Device" },
     { 0x06cb0010, "Wireless TouchPad" },
     { 0x06cb0013, "DisplayPad" },
+    { 0x06cb2970, "touchpad" },
     { 0x06cc0101, "Cable Modem" },
     { 0x06cc0102, "Cable Modem" },
     { 0x06cc0103, "Cable Modem" },
@@ -10904,16 +10920,55 @@ static const value_string usb_products_vals[] = {
     { 0x07291000, "USC-1000 Serial Port" },
     { 0x072f0001, "AC1030-based SmartCard Reader" },
     { 0x072f0008, "ACR 80 Smart Card Reader" },
+    { 0x072f0100, "AET65" },
+    { 0x072f0101, "AET65" },
+    { 0x072f0102, "AET62" },
+    { 0x072f0103, "AET62" },
+    { 0x072f0901, "ACR1281U-C4 (BSI)" },
     { 0x072f1000, "PLDT Drive" },
     { 0x072f1001, "PLDT Drive" },
+    { 0x072f2011, "ACR88U" },
+    { 0x072f2100, "ACR128U" },
     { 0x072f2200, "ACR122U" },
+    { 0x072f220a, "ACR1281U-C5 (BSI)" },
+    { 0x072f220c, "ACR1283 Bootloader" },
+    { 0x072f220f, "ACR1281U-C2 (qPBOC)" },
+    { 0x072f2211, "ACR1261 1S Dual Reader" },
+    { 0x072f2214, "ACR1222 1SAM PICC Reader" },
+    { 0x072f2215, "ACR1281 2S CL Reader" },
+    { 0x072f221a, "ACR1251U-A1" },
+    { 0x072f221b, "ACR1251U-C" },
+    { 0x072f2224, "ACR1281 1S Dual Reader" },
+    { 0x072f222b, "ACR1222U-C8" },
+    { 0x072f222c, "ACR1283L-D2" },
+    { 0x072f222d, "[OEM Reader]" },
+    { 0x072f222e, "ACR123U" },
+    { 0x072f2242, "ACR1251 1S Dual Reader" },
     { 0x072f8002, "AET63 BioTRUSTKey" },
     { 0x072f8003, "ACR120" },
     { 0x072f8103, "ACR120" },
+    { 0x072f8201, "APG8201" },
+    { 0x072f8900, "ACR89U-A1" },
+    { 0x072f8901, "ACR89U-A2" },
+    { 0x072f8902, "ACR89U-A3" },
     { 0x072f9000, "ACR38 AC1038-based Smart Card Reader" },
+    { 0x072f9006, "CryptoMate" },
     { 0x072f90cc, "ACR38 SmartCard Reader" },
+    { 0x072f90ce, "[OEM Reader]" },
     { 0x072f90cf, "ACR38 SAM Smart Card Reader" },
     { 0x072f90d0, "PertoSmart EMV - Card Reader" },
+    { 0x072f90d2, "ACR83U" },
+    { 0x072f90d8, "ACR3801" },
+    { 0x072f90db, "CryptoMate64" },
+    { 0x072fb000, "ACR3901U" },
+    { 0x072fb100, "ACR39U" },
+    { 0x072fb101, "ACR39K" },
+    { 0x072fb102, "ACR39T" },
+    { 0x072fb103, "ACR39F" },
+    { 0x072fb104, "ACR39U-SAM" },
+    { 0x072fb106, "ACOS5T2" },
+    { 0x072fb200, "ACOS5T1" },
+    { 0x072fb301, "ACR32-A1" },
     { 0x07310528, "SonyEricsson DCU-11 Cable" },
     { 0x07330101, "Digital Video Camera" },
     { 0x07330110, "VQ110 Video Camera" },
@@ -11058,6 +11113,8 @@ static const value_string usb_products_vals[] = {
     { 0x076b4321, "CardMan 4321" },
     { 0x076b5121, "CardMan 5121" },
     { 0x076b5125, "CardMan 5125" },
+    { 0x076b5321, "CardMan 5321" },
+    { 0x076b5340, "CardMan 5021 CL" },
     { 0x076b6622, "CardMan 6121" },
     { 0x076ba011, "CCID Smart Card Reader Keyboard" },
     { 0x076ba021, "CCID Smart Card Reader" },
@@ -11274,7 +11331,7 @@ static const value_string usb_products_vals[] = {
     { 0x07abfc02, "Cable II USB-2" },
     { 0x07abfc03, "USB2-IDE IDE bridge" },
     { 0x07abfcd6, "Freecom HD Classic" },
-    { 0x07abfcf6, "DataBar 512 MB" },
+    { 0x07abfcf6, "DataBar" },
     { 0x07abfcf8, "Freecom Classic SL Network Drive" },
     { 0x07abfcfe, "Hard Drive 80GB" },
     { 0x07af0004, "SCSI-DB25 SCSI Bridge [shuttle]" },
@@ -11561,6 +11618,7 @@ static const value_string usb_products_vals[] = {
     { 0x07cf4104, "Cw75 Device" },
     { 0x07cf4107, "CW-L300 Device" },
     { 0x07cf4500, "LV-20 Digital Camera" },
+    { 0x07cf6101, "fx-9750gII" },
     { 0x07cf6801, "PL-40R" },
     { 0x07cf6802, "MIDI Keyboard" },
     { 0x07d00001, "Digital Video Creator I" },
@@ -11846,6 +11904,7 @@ static const value_string usb_products_vals[] = {
     { 0x085a0022, "Parallel Port" },
     { 0x085a0023, "2 port to Serial Converter" },
     { 0x085a0024, "Parallel Port" },
+    { 0x085a0026, "PortGear SCSI" },
     { 0x085a0027, "1 port to Serial Converter" },
     { 0x085a0028, "PortGear to SCSI Converter" },
     { 0x085a0032, "PortStation SCSI Module" },
@@ -12247,6 +12306,7 @@ static const value_string usb_products_vals[] = {
     { 0x0922001a, "LabelWriter 400 Turbo" },
     { 0x09220020, "LabelWriter 450" },
     { 0x09221001, "LabelManager PnP" },
+    { 0x09228004, "M25 Digital Postal Scale" },
     { 0x0923010f, "SIIG MobileCam" },
     { 0x092423dd, "DocuPrint M760 (X760_USB)" },
     { 0x09243ce8, "Phaser 3428 Printer" },
@@ -12428,6 +12488,7 @@ static const value_string usb_products_vals[] = {
     { 0x0951160d, "DataTraveler Vault Privacy" },
     { 0x09511613, "DataTraveler DT101C Flash Drive" },
     { 0x09511616, "DataTraveler Locker 4GB" },
+    { 0x0951161a, "Dell HyperVisor internal flash drive" },
     { 0x09511621, "DataTraveler 150 (32GB)" },
     { 0x09511624, "DataTraveler G2" },
     { 0x09511625, "DataTraveler 101 II" },
@@ -12448,6 +12509,11 @@ static const value_string usb_products_vals[] = {
     { 0x09557820, "Tegra 2 AC100 developer mode" },
     { 0x0955b400, "SHIELD (debug)" },
     { 0x0955b401, "SHIELD" },
+    { 0x0955cf05, "SHIELD Tablet (debug)" },
+    { 0x0955cf06, "SHIELD Tablet" },
+    { 0x0955cf07, "SHIELD Tablet" },
+    { 0x0955cf08, "SHIELD Tablet" },
+    { 0x0955cf09, "SHIELD Tablet" },
     { 0x09570200, "E-Video DC-350 Camera" },
     { 0x09570202, "E-Video DC-350 Camera" },
     { 0x09570407, "33220A Waveform Generator" },
@@ -12456,6 +12522,7 @@ static const value_string usb_products_vals[] = {
     { 0x09571507, "33210A Waveform Generator" },
     { 0x09571745, "Test and Measurement Device (IVI)" },
     { 0x09572918, "U2702A oscilloscope" },
+    { 0x0957fb18, "LC Device" },
     { 0x09592bd0, "Intelligent ISDN (Ver. 3.60.04)" },
     { 0x095a3003, "Express Ethernet" },
     { 0x095d0001, "Polycom ViaVideo" },
@@ -12516,6 +12583,7 @@ static const value_string usb_products_vals[] = {
     { 0x09c30008, "ZFG-9800-AC SmartCard Reader" },
     { 0x09c30014, "ActivIdentity ActivKey SIM USB Token" },
     { 0x09c40011, "ACT-IR2000U IrDA Dongle" },
+    { 0x09ca5544, "PIO" },
     { 0x09cc0404, "BAFO USB-ATA/ATAPI Bridge Controller" },
     { 0x09cd2001, "Psion WaveFinder DAB radio receiver" },
     { 0x09d30001, "ISDN TA / Light Rider 128K" },
@@ -12576,6 +12644,7 @@ static const value_string usb_products_vals[] = {
     { 0x0a120009, "Nanosira4-EDR WHQL Reference Radio" },
     { 0x0a12000a, "Nanosira4-EDR-ROM" },
     { 0x0a12000b, "Nanosira5-ROM" },
+    { 0x0a120042, "SPI Converter" },
     { 0x0a120043, "Bluetooth Device" },
     { 0x0a120100, "Casira with BlueCore2-External Module" },
     { 0x0a120101, "Casira with BlueCore2-Flash Module" },
@@ -12592,7 +12661,7 @@ static const value_string usb_products_vals[] = {
     { 0x0a168888, "IBM USB Memory Key" },
     { 0x0a169988, "Trek2000 TD-G2" },
     { 0x0a170004, "Optio 330" },
-    { 0x0a170006, "Optio S" },
+    { 0x0a170006, "Optio S / S4" },
     { 0x0a170007, "Optio 550" },
     { 0x0a170009, "Optio 33WR" },
     { 0x0a17000a, "Optio 555" },
@@ -12743,6 +12812,7 @@ static const value_string usb_products_vals[] = {
     { 0x0a5f0009, "LP2844 Printer" },
     { 0x0a5f0081, "GK420t Label Printer" },
     { 0x0a5f008b, "HC100 wristbands Printer" },
+    { 0x0a5f008c, "ZP 450 Printer" },
     { 0x0a5f00d1, "Zebra GC420d Label Printer" },
     { 0x0a5f930a, "Printer" },
     { 0x0a620010, "MPMan MP-F40 MP3 Player" },
@@ -12981,12 +13051,16 @@ static const value_string usb_products_vals[] = {
     { 0x0b0517a0, "Xonar U3 sound card" },
     { 0x0b0517a1, "Eee Note EA800 (mass storage mode)" },
     { 0x0b0517ab, "USB-N13 802.11n Network Adapter (rev. B1) [Realtek RTL8192CU]" },
+    { 0x0b0517ba, "N10 Nano 802.11n Network Adapter [Realtek RTL8192CU]" },
     { 0x0b0517c7, "WL-330NUL" },
     { 0x0b0517c9, "USB-AC53 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]" },
+    { 0x0b0517d1, "AC51 802.11a/b/g/n/ac Wireless Adapter [Mediatek MT7610/Ralink RT2870]" },
     { 0x0b054c80, "Asus TF300 Transformer" },
     { 0x0b054c81, "Asus TF300 Transformer (USB debug mode)" },
     { 0x0b054c90, "Asus TF700 Transformer" },
     { 0x0b054c91, "Transformer Pad Infinity TF700 (Debug mode)" },
+    { 0x0b054ca0, "Transformer Pad TF701T" },
+    { 0x0b054ca1, "Transformer Pad TF701T (Debug mode)" },
     { 0x0b054d00, "Asus TF201 Transformer Prime (keyboard dock)" },
     { 0x0b054d01, "Asus TF201 Transformer Prime (tablet only)" },
     { 0x0b054d04, "Asus TFXXX Transformer Prime (unknown version)" },
@@ -13064,6 +13138,7 @@ static const value_string usb_products_vals[] = {
     { 0x0b48300c, "TT-connect T-3650 CI" },
     { 0x0b48300d, "TT-connect CT-3650 CI" },
     { 0x0b48300e, "TT-connect C-2400" },
+    { 0x0b483011, "TT-connect S2-4600" },
     { 0x0b483012, "TT-connect CT2-4650 CI" },
     { 0x0b483014, "TT-TVStick CT2-4400" },
     { 0x0b49064f, "Trance Vibrator" },
@@ -13132,6 +13207,7 @@ static const value_string usb_products_vals[] = {
     { 0x0bb05007, "3340z/Rollei DC3100" },
     { 0x0bb20302, "U10H010 802.11b Wireless Adapter [Intersil PRISM 3]" },
     { 0x0bb26098, "USB Cable Modem" },
+    { 0x0bb40001, "Android Phone via mass storage [Wiko Cink Peax 2]" },
     { 0x0bb400ce, "mmO2 XDA GSM/GPRS Pocket PC" },
     { 0x0bb400cf, "SPV C500 Smart Phone" },
     { 0x0bb40a01, "PocketPC Sync" },
@@ -13322,11 +13398,13 @@ static const value_string usb_products_vals[] = {
     { 0x0bb40ca8, "HTC EVO 4G LTE (second ID)" },
     { 0x0bb40cae, "T-Mobile MyTouch 4G Slide [Doubleshot]" },
     { 0x0bb40dea, "M7_UL [HTC One]" },
+    { 0x0bb40f64, "Desire 601" },
     { 0x0bb40ff8, "Desire HD (Tethering Mode)" },
     { 0x0bb40ff9, "Desire / Desire HD / Hero / Thunderbolt (Charge Mode)" },
     { 0x0bb40ffe, "Desire HD (modem mode)" },
     { 0x0bb40fff, "Android Fastboot Bootloader" },
     { 0x0bb42008, "HTC Zopo ZP100 (ID2)" },
+    { 0x0bb4200b, "Android Phone via PTP [Wiko Cink Peax 2]" },
     { 0x0bb4685c, "Hewlett-Packard HP Touchpad" },
     { 0x0bc20502, "ST3300601CB-RK 300 GB External Hard Drive" },
     { 0x0bc20503, "ST3250824A [Barracuda 7200.9]" },
@@ -13335,6 +13413,7 @@ static const value_string usb_products_vals[] = {
     { 0x0bc22200, "FreeAgent Go FW" },
     { 0x0bc22300, "Expansion Portable" },
     { 0x0bc22320, "USB 3.0 bridge [Portable Expansion Drive]" },
+    { 0x0bc23000, "FreeAgent Desktop" },
     { 0x0bc23008, "FreeAgent Desk 1TB" },
     { 0x0bc23101, "FreeAgent XTreme 640GB" },
     { 0x0bc23312, "SRD00F2 Expansion Desktop Drive (STBV)" },
@@ -13355,6 +13434,8 @@ static const value_string usb_products_vals[] = {
     { 0x0bc2a0a4, "Backup Plus Desktop Drive" },
     { 0x0bc2ab00, "Slim Portable Drive" },
     { 0x0bc2ab20, "Backup Plus Portable Drive" },
+    { 0x0bc2ab21, "Backup Plus Slim" },
+    { 0x0bc2ab31, "Backup Plus Desktop Drive (5TB)" },
     { 0x0bc30001, "UMTS-TDD (TD-CDMA) modem" },
     { 0x0bc70001, "ActiveHome (ACPI-compliant)" },
     { 0x0bc70002, "Firecracker Interface (ACPI-compliant)" },
@@ -13409,6 +13490,7 @@ static const value_string usb_products_vals[] = {
     { 0x0bda2832, "RTL2832U DVB-T" },
     { 0x0bda2838, "RTL2838 DVB-T" },
     { 0x0bda5730, "HP 2.0MP High Definition Webcam" },
+    { 0x0bda5775, "HP \"Truevision HD\" laptop camera" },
     { 0x0bda8150, "RTL8150 Fast Ethernet Adapter" },
     { 0x0bda8151, "RTL8151 Adapteon Business Mobile Networks BV" },
     { 0x0bda8171, "RTL8188SU 802.11n WLAN Adapter" },
@@ -13512,6 +13594,7 @@ static const value_string usb_products_vals[] = {
     { 0x0c2e0720, "Metrologic MS7120 Barcode Scanner (bi-directional serial mode)" },
     { 0x0c2e0b61, "Vuquest 3310g" },
     { 0x0c2e0b6a, "Vuquest 3310 Area-Imaging Scanner" },
+    { 0x0c2e0b81, "Barcode scanner Voyager 1400g Series" },
     { 0x0c440021, "iDEN P2k0 Device" },
     { 0x0c440022, "iDEN P2k1 Device" },
     { 0x0c4403a2, "iDEN Smartphone" },
@@ -14051,6 +14134,7 @@ static const value_string usb_products_vals[] = {
     { 0x0d9f00a5, "Vanguard Uninterruptible Power Supply (HID PDC)" },
     { 0x0d9f00a6, "Black Knight PRO Uninterruptible Power Supply (HID PDC)" },
     { 0x0da40001, "Interface" },
+    { 0x0da40008, "Loop" },
     { 0x0da80001, "SDS 200A Oscilloscope" },
     { 0x0dab0100, "DVR/CVR-M140 MP3 Player" },
     { 0x0db01020, "PC2PC WLAN Card" },
@@ -14107,6 +14191,7 @@ static const value_string usb_products_vals[] = {
     { 0x0dc40041, "Mass Storage Device" },
     { 0x0dc40042, "Mass Storage Device" },
     { 0x0dc40101, "Hi-Speed Mass Storage Device" },
+    { 0x0dc40209, "SK-3500 S2" },
     { 0x0dc4020a, "Oyen Digital MiniPro 2.5\" hard drive enclosure" },
     { 0x0dc62301, "Wireless Touchpad Keyboard" },
     { 0x0dcd0001, "Remote Interface Adapter" },
@@ -14207,6 +14292,7 @@ static const value_string usb_products_vals[] = {
     { 0x0e0b9031, "802.11n Wireless USB Card" },
     { 0x0e0b9041, "802.11n Wireless USB Card" },
     { 0x0e0c0101, "LonUSB LonTalk Network Adapter" },
+    { 0x0e0d0003, "PicoHarp 300" },
     { 0x0e0f0001, "Device" },
     { 0x0e0f0002, "Virtual USB Hub" },
     { 0x0e0f0003, "Virtual Mouse" },
@@ -14351,7 +14437,7 @@ static const value_string usb_products_vals[] = {
     { 0x0e8d0003, "MT6227 phone" },
     { 0x0e8d0004, "MT6227 phone" },
     { 0x0e8d0023, "S103" },
-    { 0x0e8d1806, "Samsung SE-208AB Slim Portable DVD Writer" },
+    { 0x0e8d1806, "Samsung SE-208 Slim Portable DVD Writer" },
     { 0x0e8d1836, "Samsung SE-S084 Super WriteMaster Slim External DVD writer" },
     { 0x0e8d2000, "MT65xx Preloader" },
     { 0x0e8d3329, "Qstarz BT-Q1000XT" },
@@ -14368,7 +14454,7 @@ static const value_string usb_products_vals[] = {
     { 0x0e9c0000, "Streamzap Remote Control" },
     { 0x0ea02126, "7-in-1 Card Reader" },
     { 0x0ea02153, "SD Card Reader Key" },
-    { 0x0ea02168, "Transcend JetFlash 2.0 / Astone USB Drive" },
+    { 0x0ea02168, "Transcend JetFlash 2.0 / Astone USB Drive / Intellegent Stick 2.0" },
     { 0x0ea06803, "OTI-6803 Flash Disk" },
     { 0x0ea06808, "OTI-6808 Flash Disk" },
     { 0x0ea06828, "OTI-6828 Flash Disk" },
@@ -14580,7 +14666,7 @@ static const value_string usb_products_vals[] = {
     { 0x0fcea176, "SONY SO-03D Xperia Acro HD MTP+UMS" },
     { 0x0fcea177, "SONY LT28at Xperia Ion MTP+UMS" },
     { 0x0fcea17e, "SONY ST27i/ST27a Xperia go MTP+UMS" },
-    { 0x0fceadde, "Boot loader" },
+    { 0x0fceadde, "C2005 (Xperia M dual) in service mode" },
     { 0x0fceb173, "SONY MT27i Xperia Sola MTP+UMS+ADB" },
     { 0x0fceb175, "SONY IS12S Xperia Acro MTP+UMS+ADB" },
     { 0x0fceb176, "SONY SO-03D Xperia Acro MTP+UMS+ADB" },
@@ -14606,8 +14692,10 @@ static const value_string usb_products_vals[] = {
     { 0x0fced0cf, "MD300 Mobile Broadband Modem" },
     { 0x0fced0d4, "C902 Phone [Modem]" },
     { 0x0fced0e1, "MD400 Mobile Broadband Modem" },
+    { 0x0fced12a, "U100i Yari Phone" },
     { 0x0fced12e, "Xperia X10" },
     { 0x0fced144, "SonyEricsson j10i (Elm)" },
+    { 0x0fced14e, "J108i Cedar" },
     { 0x0fcee000, "SonyEricsson K550i" },
     { 0x0fcee039, "K800i (msc mode)" },
     { 0x0fcee042, "W810i Phone" },
@@ -14631,6 +14719,7 @@ static const value_string usb_products_vals[] = {
     { 0x0fcee161, "Xperia Ray" },
     { 0x0fcee166, "Xperia Mini Pro" },
     { 0x0fcee167, "XPERIA mini" },
+    { 0x0fcee19b, "C2005 [Xperia M dual] (Mass Storage)" },
     { 0x0fcef0fa, "Liveview micro display MN800 in DFU mode" },
     { 0x0fcf1003, "ANT Development Board" },
     { 0x0fcf1004, "ANTUSB Stick" },
@@ -14648,6 +14737,7 @@ static const value_string usb_products_vals[] = {
     { 0x0fd90037, "Video Capture v2" },
     { 0x0fda0100, "quanton flight control" },
     { 0x0fdeca01, "WMRS200 weather station" },
+    { 0x0fdeca05, "CM160" },
     { 0x0fe00100, "Bluetooth Mouse" },
     { 0x0fe00101, "Bluetooth IMU" },
     { 0x0fe00200, "Bluetooth Keypad" },
@@ -14696,7 +14786,7 @@ static const value_string usb_products_vals[] = {
     { 0x10051001, "MP3 Player" },
     { 0x10051004, "MP3 Player" },
     { 0x10051006, "MP3 Player" },
-    { 0x1005b113, "Handy Steno 2.0/HT203" },
+    { 0x1005b113, "Handy Steno/AH123 / Handy Steno 2.0/HT203" },
     { 0x1005b223, "CD-RW + 6in1 Card Reader Digital Storage / Converter" },
     { 0x10063001, "iHP-100" },
     { 0x10063002, "iHP-120/140 MP3 Player" },
@@ -14776,6 +14866,7 @@ static const value_string usb_products_vals[] = {
     { 0x10500010, "Yubikey" },
     { 0x10500110, "Yubikey NEO OTP" },
     { 0x10500111, "Yubikey NEO OTP+CCID" },
+    { 0x10500112, "Yubikey NEO CCID" },
     { 0x10500200, "U2F Gnubby" },
     { 0x10500211, "Gnubby" },
     { 0x10545004, "DSL 7420 Loader" },
@@ -14783,35 +14874,44 @@ static const value_string usb_products_vals[] = {
     { 0x10580200, "FireWire USB Combo" },
     { 0x10580400, "External HDD" },
     { 0x10580500, "hub" },
-    { 0x10580702, "Passport External HDD" },
-    { 0x10580704, "Passport External HDD" },
+    { 0x10580701, "WD Passport (WDXMS)" },
+    { 0x10580702, "WD Passport (WDXMS)" },
+    { 0x10580704, "My Passport Essential (WDME)" },
+    { 0x10580705, "My Passport Elite (WDML)" },
     { 0x1058070a, "My Passport Essential (WDBAAA), My Passport for Mac (WDBAAB), My Passport Essential SE (WDBABM), My Passport SE for Mac (WDBABW)" },
     { 0x1058070b, "My Passport Elite (WDBAAC)" },
     { 0x1058070c, "My Passport Studio (WDBAAE)" },
     { 0x1058071a, "My Passport Essential (WDBAAA)" },
     { 0x1058071d, "My Passport Studio (WDBALG)" },
     { 0x10580730, "My Passport Essential (WDBACY)" },
+    { 0x10580732, "My Passport Essential SE (WDBGYS)" },
     { 0x10580740, "My Passport Essential (WDBACY)" },
     { 0x10580741, "My Passport Ultra" },
-    { 0x10580742, "My Passport Essential SE" },
-    { 0x10580748, "My Passport (WDBKXH)" },
+    { 0x10580742, "My Passport Essential SE (WDBGYS)" },
+    { 0x10580748, "My Passport (WDBKXH, WDBY8L)" },
+    { 0x105807a8, "My Passport (WDBBEP), My Passport for Mac (WDBLUZ)" },
     { 0x10580810, "My Passport Ultra (WDBZFP)" },
+    { 0x10580820, "My Passport Ultra (WDBMWV, WDBZFP)" },
     { 0x10580900, "MyBook Essential External HDD" },
     { 0x10580901, "My Book Essential Edition (Green Ring) (WDG1U)" },
     { 0x10580902, "My Book Pro Edition (WDG1T)" },
     { 0x10580903, "My Book Premium Edition" },
     { 0x10580910, "My Book Essential Edition (Green Ring) (WDG1U)" },
     { 0x10581001, "Elements Desktop (WDE1U)" },
-    { 0x10581003, "Elements 1000 GB" },
+    { 0x10581003, "WD Elements Desktop (WDE1UBK)" },
     { 0x10581010, "Elements Portable (WDBAAR)" },
     { 0x10581021, "Elements Desktop (WDBAAU)" },
     { 0x10581023, "Elements SE Portable (WDBABV)" },
+    { 0x10581042, "Elements SE Portable (WDBPCK)" },
     { 0x10581048, "Elements Portable (WDBU6Y)" },
+    { 0x1058107c, "Elements Desktop (WDBWLG)" },
     { 0x105810a2, "Elements SE Portable (WDBPCK)" },
     { 0x105810a8, "Elements Portable (WDBUZG)" },
+    { 0x105810b8, "Elements Portable (WDBU6Y, WDBUZG)" },
     { 0x10581100, "My Book Essential Edition 2.0 (WDH1U)" },
+    { 0x10581102, "My Book Home Edition (WDH1CS)" },
     { 0x10581103, "My Book Studio" },
-    { 0x10581104, "MyBook Mirror Edition External HDD" },
+    { 0x10581104, "My Book Mirror Edition (WDH2U)" },
     { 0x10581105, "My Book Studio II" },
     { 0x10581110, "My Book Essential (WDBAAF), My Book for Mac (WDBAAG)" },
     { 0x10581111, "My Book Elite (WDBAAH)" },
@@ -14819,6 +14919,7 @@ static const value_string usb_products_vals[] = {
     { 0x10581123, "My Book 3.0 (WDBABP)" },
     { 0x10581130, "My Book Essential (WDBACW)" },
     { 0x10581140, "My Book Essential (WDBACW)" },
+    { 0x10581230, "My Book (WDBFJK0030HBK)" },
     { 0x1059000b, "StarSign Bio Token 3.0" },
     { 0x10631555, "MC141555 Hub" },
     { 0x10634100, "SB4100 USB Cable Modem" },
@@ -14909,7 +15010,38 @@ static const value_string usb_products_vals[] = {
     { 0x109f3164, "Trigem Mobile SmartDisplay121" },
     { 0x10a91102, "Sky Love Actually IM-U460K" },
     { 0x10a91104, "Sky Vega IM-A650S" },
+    { 0x10a91105, "VEGA Android composite" },
+    { 0x10a91106, "VEGA Android composite" },
+    { 0x10a91107, "VEGA Android composite" },
+    { 0x10a91108, "VEGA Android composite" },
+    { 0x10a91109, "VEGA Android composite" },
     { 0x10a96021, "SIRIUS alpha" },
+    { 0x10a96031, "Pantech Android composite" },
+    { 0x10a96032, "Pantech Android composite" },
+    { 0x10a96033, "Pantech Android composite" },
+    { 0x10a96034, "Pantech Android composite" },
+    { 0x10a96035, "Pantech Android composite" },
+    { 0x10a96036, "Pantech Android composite" },
+    { 0x10a96037, "Pantech Android composite" },
+    { 0x10a96050, "Pantech Android composite" },
+    { 0x10a96051, "Pantech Android composite" },
+    { 0x10a96052, "Pantech Android composite" },
+    { 0x10a96053, "Pantech Android composite" },
+    { 0x10a96054, "Pantech Android composite" },
+    { 0x10a96055, "Pantech Android composite" },
+    { 0x10a96056, "Pantech Android composite" },
+    { 0x10a96057, "Pantech Android composite" },
+    { 0x10a96058, "Pantech Android composite" },
+    { 0x10a96059, "Pantech Android composite" },
+    { 0x10a96080, "MHS291LVW LTE Modem [Verizon Jetpack 4G LTE Mobile Hotspot MHS291L] (Zero CD Mode)" },
+    { 0x10a96085, "MHS291LVW LTE Modem [Verizon Jetpack 4G LTE Mobile Hotspot MHS291L] (Modem Mode)" },
+    { 0x10a97031, "Pantech Android composite" },
+    { 0x10a97032, "Pantech Android composite" },
+    { 0x10a97033, "Pantech Android composite" },
+    { 0x10a97034, "Pantech Android composite" },
+    { 0x10a97035, "Pantech Android composite" },
+    { 0x10a97036, "Pantech Android composite" },
+    { 0x10a97037, "Pantech Android composite" },
     { 0x10ab1002, "Bluetooth Device" },
     { 0x10ab1003, "BC02-EXT in DFU" },
     { 0x10ab1005, "Bluetooth Adptr" },
@@ -14958,6 +15090,7 @@ static const value_string usb_products_vals[] = {
     { 0x10c48863, "C8051F34x Bootloader" },
     { 0x10c48897, "C8051F38x HDMI Splitter [UHBX]" },
     { 0x10c48918, "C8051F38x HDMI Audio Extractor [VSA-HA-DP]" },
+    { 0x10c48973, "C8051F38x HDMI Splitter [UHBX-8X]" },
     { 0x10c4ea60, "CP210x UART Bridge / myAVR mySmartUSB light" },
     { 0x10c4ea61, "CP210x UART Bridge" },
     { 0x10c4ea70, "CP210x UART Bridge" },
@@ -15189,7 +15322,7 @@ static const value_string usb_products_vals[] = {
     { 0x12410504, "Wireless Trackball Keyboard" },
     { 0x12411111, "Mouse" },
     { 0x12411122, "Typhoon Stream Optical Mouse USB+PS/2" },
-    { 0x12411155, "PS2/USB Browser Combo Mouse" },
+    { 0x12411155, "Memorex Optical ScrollPro Mouse SE MX4600" },
     { 0x12411166, "MI-2150 Trust Mouse" },
     { 0x12411177, "Mouse [HT82M21A]" },
     { 0x12411503, "Keyboard" },
@@ -15204,6 +15337,7 @@ static const value_string usb_products_vals[] = {
     { 0x125c0010, "Alta series CCD" },
     { 0x125f312a, "Superior S102" },
     { 0x125f312b, "Superior S102 Pro" },
+    { 0x125fa15a, "DashDrive Durable HD710 portable HDD various size" },
     { 0x125fa22a, "DashDrive Elite HE720 500GB" },
     { 0x125fa91a, "Portable HDD CH91" },
     { 0x125fc08a, "C008 Flash Drive" },
@@ -15261,6 +15395,7 @@ static const value_string usb_products_vals[] = {
     { 0x12920258, "Creative Labs VoIP Blaster" },
     { 0x12930002, "F5U002 Parallel Port [uss720]" },
     { 0x12932101, "104-key keyboard" },
+    { 0x12941320, "Webmail Notifier" },
     { 0x129b160b, "Siemens S30853-S1031-R351 802.11g Wireless Adapter [Atheros AR5523]" },
     { 0x129b160c, "Siemens S30853-S1038-R351 802.11g Wireless Adapter [Atheros AR5523]" },
     { 0x129b1666, "TG54USB 802.11bg" },
@@ -15271,6 +15406,7 @@ static const value_string usb_products_vals[] = {
     { 0x12ba0120, "RedOctane Drum Kit for PlayStation(R)3" },
     { 0x12ba0200, "Harmonix Guitar for PlayStation(R)3" },
     { 0x12ba0210, "Harmonix Drum Kit for PlayStation(R)3" },
+    { 0x12bdd012, "JPD Shockforce gamepad" },
     { 0x12c40006, "Teleprompter Two-button Hand Control (v1)" },
     { 0x12c40008, "Teleprompter Foot Control (v1)" },
     { 0x12cf0170, "Tt eSPORTS BLACK Gaming mouse" },
@@ -15285,6 +15421,7 @@ static const value_string usb_products_vals[] = {
     { 0x12d11038, "Ideos (debug mode)" },
     { 0x12d11039, "Ideos (tethering mode)" },
     { 0x12d11051, "Huawei Honor U8860" },
+    { 0x12d11404, "EM770W miniPCI WCDMA Modem" },
     { 0x12d11406, "E1750" },
     { 0x12d1140b, "EC1260 Wireless Data Modem HSD USB Card" },
     { 0x12d1140c, "E180v" },
@@ -15421,7 +15558,13 @@ static const value_string usb_products_vals[] = {
     { 0x13570089, "OpenSDA - CDC Serial Port" },
     { 0x13570503, "USB-ML-12 HCS08/HCS12 Multilink" },
     { 0x13570504, "DEMOJM" },
+    { 0x135f0110, "Linear Spectrograph" },
+    { 0x135f0111, "Spectrograph - Renumerated" },
+    { 0x135f0200, "Linear Spectrograph" },
+    { 0x135f0201, "Spectrograph - Renumerated" },
+    { 0x135f0240, "MPP Spectrograph" },
     { 0x13660101, "J-Link PLUS" },
+    { 0x136e0014, "Zyla 5.5 sCMOS camera" },
     { 0x13700323, "Swissmemory cirrusWHITE" },
     { 0x13706828, "Victorinox Flash Drive" },
     { 0x13710001, "CNUSB-611AR Wireless Adapter-G [AT76C503]" },
@@ -15443,7 +15586,9 @@ static const value_string usb_products_vals[] = {
     { 0x138a0005, "VFS301 Fingerprint Reader" },
     { 0x138a0007, "VFS451 Fingerprint Reader" },
     { 0x138a0008, "VFS300 Fingerprint Reader" },
+    { 0x138a0010, "VFS Fingerprint sensor" },
     { 0x138a0011, "VFS5011 Fingerprint Reader" },
+    { 0x138a0017, "Fingerprint Reader" },
     { 0x138a0018, "Fingerprint scanner" },
     { 0x138a003c, "VFS471 Fingerprint Reader" },
     { 0x138a003d, "VFS491" },
@@ -15549,10 +15694,12 @@ static const value_string usb_products_vals[] = {
     { 0x13d35716, "UVC VGA Webcam" },
     { 0x13d37020, "DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005)" },
     { 0x13d37022, "DTV-DVB UDST7022BDA DVB-S Box(Without HID)" },
+    { 0x13d70001, "T5 PATA forensic bridge" },
     { 0x13e50001, "SL-1" },
     { 0x13e50003, "TTM 57SL" },
     { 0x13ea0001, "C-56 Thermal Printer" },
     { 0x13ec0006, "HID Remote Control" },
+    { 0x13ee0001, "Optical Mouse" },
     { 0x13ee0003, "Optical Mouse" },
     { 0x13fd0840, "INIC-1618L SATA" },
     { 0x13fd0841, "Samsung SE-T084M DVD-RW" },
@@ -15576,6 +15723,7 @@ static const value_string usb_products_vals[] = {
     { 0x13fe3600, "flash drive (4GB, EMTEC)" },
     { 0x13fe3800, "Rage XT Flash Drive" },
     { 0x13fe3e00, "Flash Drive" },
+    { 0x13fe4100, "Flash drive" },
     { 0x13fe5000, "USB flash drive (32 GB SHARKOON Accelerate)" },
     { 0x13fe5100, "Flash Drive" },
     { 0x14030001, "Digital Photo Frame" },
@@ -15685,12 +15833,15 @@ static const value_string usb_products_vals[] = {
     { 0x148f5372, "RT5372 Wireless Adapter" },
     { 0x148f5572, "RT5572 Wireless Adapter" },
     { 0x148f7601, "MT7601U Wireless Adapter" },
+    { 0x148f760b, "MT7601U Wireless Adapter" },
     { 0x148f9020, "RT2500USB Wireless Adapter" },
     { 0x148f9021, "RT2501USB Wireless Adapter" },
     { 0x14910020, "FS81 Fingerprint Scanner Module" },
     { 0x14930010, "Bluebird [Ambit]" },
     { 0x14930019, "Duck [Ambit2]" },
     { 0x1493001a, "Colibri [Ambit2 S]" },
+    { 0x1493001b, "Emu [Ambit3 Peak]" },
+    { 0x1493001c, "Finch [Ambit3 Sport]" },
     { 0x1493001d, "Greentit [Ambit2 R]" },
     { 0x1498a090, "DVB-T Tuner" },
     { 0x149a2107, "DBX1 DSP core" },
@@ -15718,6 +15869,7 @@ static const value_string usb_products_vals[] = {
     { 0x14b23c2c, "Keebox W150NU 802.11bgn Wireless Adapter [Ralink RT3070]" },
     { 0x14c20250, "Storage Adapter V2" },
     { 0x14c20350, "Storage Adapter V2" },
+    { 0x14cd1212, "microSD card reader (SY-T18)" },
     { 0x14cd121c, "microSD card reader" },
     { 0x14cd121f, "microSD CardReader SY-T18" },
     { 0x14cd123a, "SD/MMC/RS-MMC Card Reader" },
@@ -17398,6 +17550,10 @@ static const value_string usb_products_vals[] = {
     { 0x2821160f, "WL-160g 802.11g Wireless Adapter [Envara WiND512]" },
     { 0x28213300, "WL-140 / Hawking HWU36D 802.11b Wireless Adapter [Intersil PRISM 3]" },
     { 0x2899012c, "Camera Device" },
+    { 0x29310a01, "Jolla Phone MTP" },
+    { 0x29310a02, "Jolla Phone Developer" },
+    { 0x29310a05, "Jolla PC connection" },
+    { 0x29310afe, "Jolla charging only" },
     { 0x2c0214ea, "GW-US11H WLAN" },
     { 0x2c1a0000, "Wireless Optical Mouse" },
     { 0x31250001, "TrackerPod Camera Stand" },