[Automatic update for 2015-12-20]

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

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

1 files changed, 176 insertions, 69 deletions

diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index f5c70a4c8f..52fbef5613 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -1262,6 +1262,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x0a84, "Maui Innovative Peripherals" },
     { 0x0a85, "Idexx Labs" },
     { 0x0a86, "NITGen Co., Ltd" },
+    { 0x0a89, "Aktiv" },
     { 0x0a8d, "Picturetel" },
     { 0x0a8e, "Japan Aviation Electronics Industry, Ltd" },
     { 0x0a90, "Candy Technology Co., Ltd" },
@@ -2856,6 +2857,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x2406, "SANHO Digital Electronics Co., Ltd." },
     { 0x2443, "Aessent Technology Ltd" },
     { 0x2478, "Tripp-Lite" },
+    { 0x248a, "Maxxter" },
     { 0x249c, "M2Tech s.r.l." },
     { 0x24e1, "Paratronic" },
     { 0x2632, "TwinMOS" },
@@ -3124,7 +3126,7 @@ static const value_string usb_products_vals[] = {
     { 0x03f00117, "LaserJet 3200" },
     { 0x03f0011c, "hn210w 802.11b Adapter" },
     { 0x03f0011d, "Bluetooth 1.2 Interface [Broadcom BCM2035]" },
-    { 0x03f00121, "HP49g+ Calculator" },
+    { 0x03f00121, "HP 39g+ [F2224A], 39gs [F2223A], 40gs [F2225A], 48gII [F2226A], 49g+ [F2228A], 50g [F2229A, NW240AA]" },
     { 0x03f00122, "HID Internet Keyboard" },
     { 0x03f00125, "DAT72 Tape" },
     { 0x03f00139, "Barcode Scanner 4430" },
@@ -3158,7 +3160,7 @@ static const value_string usb_products_vals[] = {
     { 0x03f00417, "LaserJet 1200 series" },
     { 0x03f00423, "HS-COMBO Cardreader" },
     { 0x03f0042a, "LaserJet M1132 MFP" },
-    { 0x03f00441, "HP Prime Calculator" },
+    { 0x03f00441, "Prime [NW280AA, G8X92AA]" },
     { 0x03f00504, "DeskJet 885c" },
     { 0x03f00505, "ScanJet 2100c" },
     { 0x03f00507, "DVD+RW" },
@@ -3180,6 +3182,7 @@ static const value_string usb_products_vals[] = {
     { 0x03f00711, "OfficeJet K80" },
     { 0x03f00712, "DeskJet 1180c" },
     { 0x03f00714, "Printing Support" },
+    { 0x03f00741, "Prime Wireless Kit [FOK65AA]" },
     { 0x03f00801, "ScanJet 7400c" },
     { 0x03f00804, "DeskJet 816c" },
     { 0x03f00805, "HP4470C" },
@@ -3247,6 +3250,7 @@ static const value_string usb_products_vals[] = {
     { 0x03f01517, "color LaserJet 3500" },
     { 0x03f01524, "Smart Card Keyboard - KR" },
     { 0x03f01539, "Mini Magnetic Stripe Reader" },
+    { 0x03f01541, "Prime [G8X92AA]" },
     { 0x03f01602, "PhotoSmart 330 series" },
     { 0x03f01604, "DeskJet 940c" },
     { 0x03f01605, "ScanJet 5530C PhotoSmart" },
@@ -3346,6 +3350,7 @@ static const value_string usb_products_vals[] = {
     { 0x03f02917, "LaserJet 2420" },
     { 0x03f02a11, "PSC 2150 series" },
     { 0x03f02a17, "LaserJet 2430" },
+    { 0x03f02a1d, "Integrated Module with Bluetooth 2.1 Wireless technology" },
     { 0x03f02b11, "PSC 2170 series" },
     { 0x03f02b17, "LaserJet 1020" },
     { 0x03f02c12, "Officejet J4680" },
@@ -3623,6 +3628,7 @@ static const value_string usb_products_vals[] = {
     { 0x03f0c702, "PhotoSmart D7300 series" },
     { 0x03f0c802, "PhotoSmart D5060 Printer" },
     { 0x03f0d104, "Bluetooth Dongle" },
+    { 0x03f0d507, "39gII [NW249AA]" },
     { 0x03f0efbe, "NEC Picty900" },
     { 0x03f0f0be, "NEC Picty920" },
     { 0x03f0f1be, "NEC Picty800" },
@@ -4202,6 +4208,7 @@ static const value_string usb_products_vals[] = {
     { 0x041e3061, "SoundBlaster Audigy 2 ZS Video Editor" },
     { 0x041e3090, "Sound Blaster Digital Music SX" },
     { 0x041e30d3, "Sound Blaster Play!" },
+    { 0x041e3100, "IR Receiver (SB0540)" },
     { 0x041e3121, "WoW tap chat" },
     { 0x041e3220, "Sound Blaster Tactic(3D) Sigma sound card" },
     { 0x041e3f00, "E-Mu Xboard 25 MIDI Controller" },
@@ -4839,6 +4846,7 @@ static const value_string usb_products_vals[] = {
     { 0x04580072, "Navigator 335" },
     { 0x04580083, "Bluetooth Dongle" },
     { 0x04580087, "Ergo 525V Laser Mouse" },
+    { 0x04580089, "Genius Traveler 350" },
     { 0x045800ca, "Pen Mouse" },
     { 0x04580100, "EasyPen Tablet" },
     { 0x04580101, "CueCat" },
@@ -5296,6 +5304,7 @@ static const value_string usb_products_vals[] = {
     { 0x046a0080, "eHealth Terminal ST 1503" },
     { 0x046a0081, "eHealth Keyboard G87 1504" },
     { 0x046a0106, "R-300 Wireless Mouse Receiver" },
+    { 0x046a010d, "MX-Board 3.0 Keyboard" },
     { 0x046b0001, "Keyboard" },
     { 0x046b0101, "PS/2 Keyboard, Mouse & Joystick Ports" },
     { 0x046b0301, "USB 1.0 Hub" },
@@ -6947,7 +6956,7 @@ static const value_string usb_products_vals[] = {
     { 0x04b34427, "Portable CD ROM" },
     { 0x04b34482, "Serial Converter" },
     { 0x04b34484, "SMSC USB20H04 3-Port Hub [ThinkPad X4 UltraBase, Wistron S Note-3 Media Slice]" },
-    { 0x04b34485, "Serial Converter" },
+    { 0x04b34485, "ThinkPad Dock Hub" },
     { 0x04b34524, "40 Character Vacuum Fluorescent Display" },
     { 0x04b34525, "Double sided CRT" },
     { 0x04b34535, "4610 Suremark Printer" },
@@ -7166,7 +7175,7 @@ static const value_string usb_products_vals[] = {
     { 0x04b80879, "EP-904A/EP-904F [Artisan 837/Stylus Photo PX830FWD Series]" },
     { 0x04b8087b, "EP-804A/EP-804AR/EP-804AW [Stylus Photo PX730WD/Artisan 730 Series]" },
     { 0x04b8087c, "PX-1700F" },
-    { 0x04b8087d, "PX-B750F" },
+    { 0x04b8087d, "PX-B750F/WP-4525 Series" },
     { 0x04b8087f, "PX-403A" },
     { 0x04b80880, "PX-434A [Stylus NX330 Series]" },
     { 0x04b80881, "PX-404A [ME OFFICE 535]" },
@@ -8002,6 +8011,7 @@ static const value_string usb_products_vals[] = {
     { 0x04f3000a, "Touchscreen" },
     { 0x04f30103, "ActiveJet K-2024 Multimedia Keyboard" },
     { 0x04f301a4, "Wireless Keyboard" },
+    { 0x04f30201, "Touchscreen" },
     { 0x04f30210, "Optical Mouse" },
     { 0x04f30212, "Laser Mouse" },
     { 0x04f30214, "Lynx M9 Optical Mouse" },
@@ -8441,6 +8451,7 @@ static const value_string usb_products_vals[] = {
     { 0x04f9035c, "DCP-1610NW" },
     { 0x04f9035d, "MFC-1910W" },
     { 0x04f9035e, "MFC-1910NW" },
+    { 0x04f90360, "DCP-1618W" },
     { 0x04f90361, "MFC-1919NW" },
     { 0x04f90364, "MFC-J5625DW" },
     { 0x04f90365, "MFC-J4520DW" },
@@ -9166,25 +9177,25 @@ static const value_string usb_products_vals[] = {
     { 0x056a0002, "PenPartner 6x8" },
     { 0x056a0003, "PTU-600 [Cintiq Partner]" },
     { 0x056a0010, "ET-0405 [Graphire]" },
-    { 0x056a0011, "Graphire 2 4x5" },
-    { 0x056a0012, "Graphire 2 5x7" },
-    { 0x056a0013, "Graphire 3 4x5" },
-    { 0x056a0014, "Graphire 3 6x8" },
-    { 0x056a0015, "Graphire 4 4x5" },
-    { 0x056a0016, "Graphire 4 6x8" },
-    { 0x056a0017, "CTE-450 [Bamboo Fun]" },
-    { 0x056a0018, "Bamboo Fun 6x8" },
-    { 0x056a0019, "Bamboo One Medium" },
-    { 0x056a0020, "Intuos 4x5" },
-    { 0x056a0021, "Intuos 6x8" },
-    { 0x056a0022, "Intuos 9x12" },
-    { 0x056a0023, "Intuos 12x12" },
-    { 0x056a0024, "Intuos 12x18" },
-    { 0x056a0026, "Intuos5 touch S" },
-    { 0x056a0027, "Intuos5 touch M" },
-    { 0x056a0028, "Intuos5 touch L" },
-    { 0x056a0029, "Intuos5 S" },
-    { 0x056a002a, "Intuos5 M" },
+    { 0x056a0011, "ET-0405A [Graphire2 (4x5)]" },
+    { 0x056a0012, "ET-0507A [Graphire2 (5x7)]" },
+    { 0x056a0013, "CTE-430 [Graphire3 (4x5)]" },
+    { 0x056a0014, "CTE-630 [Graphire3 (6x8)]" },
+    { 0x056a0015, "CTE-440 [Graphire4 (4x5)]" },
+    { 0x056a0016, "CTE-640 [Graphire4 (6x8)]" },
+    { 0x056a0017, "CTE-450 [Bamboo Fun (small)]" },
+    { 0x056a0018, "CTE-650 [Bamboo Fun (medium)]" },
+    { 0x056a0019, "CTE-631 [Bamboo One]" },
+    { 0x056a0020, "GD-0405 [Intuos (4x5)]" },
+    { 0x056a0021, "GD-0608 [Intuos (6x8)]" },
+    { 0x056a0022, "GD-0912 [Intuos (9x12)]" },
+    { 0x056a0023, "GD-1212 [Intuos (12x12)]" },
+    { 0x056a0024, "GD-1218 [Intuos (12x18)]" },
+    { 0x056a0026, "PTH-450 [Intuos5 touch (S)]" },
+    { 0x056a0027, "PTH-650 [Intuos5 touch (M)]" },
+    { 0x056a0028, "PTH-850 [Intuos5 touch (L)]" },
+    { 0x056a0029, "PTK-450 [Intuos5 (S)]" },
+    { 0x056a002a, "PTK-650 [Intuos5 (M)]" },
     { 0x056a0030, "PL400" },
     { 0x056a0031, "PL500" },
     { 0x056a0032, "PL600" },
@@ -9194,58 +9205,105 @@ static const value_string usb_products_vals[] = {
     { 0x056a0037, "PL700" },
     { 0x056a0038, "PL510" },
     { 0x056a0039, "DTU-710" },
-    { 0x056a003f, "Cintiq 21UX (DTZ-2100)" },
-    { 0x056a0041, "Intuos2 4x5" },
-    { 0x056a0042, "Intuos2 6x8" },
-    { 0x056a0043, "Intuos2 9x12" },
-    { 0x056a0044, "Intuos2 12x12" },
-    { 0x056a0045, "Intuos2 12x18" },
+    { 0x056a003f, "DTZ-2100 [Cintiq 21UX]" },
+    { 0x056a0041, "XD-0405-U [Intuos2 (4x5)]" },
+    { 0x056a0042, "XD-0608-U [Intuos2 (6x8)]" },
+    { 0x056a0043, "XD-0912-U [Intuos2 (9x12)]" },
+    { 0x056a0044, "XD-1212-U [Intuos2 (12x12)]" },
+    { 0x056a0045, "XD-1218-U [Intuos2 (12x18)]" },
     { 0x056a0047, "Intuos2 6x8" },
-    { 0x056a0060, "Volito" },
-    { 0x056a0061, "PenStation2" },
-    { 0x056a0062, "Volito2 4x5" },
-    { 0x056a0063, "Volito2 2x3" },
-    { 0x056a0064, "PenPartner2" },
-    { 0x056a0065, "Bamboo" },
-    { 0x056a0069, "Bamboo One" },
-    { 0x056a0081, "Graphire Wireless 6x8" },
+    { 0x056a0057, "DTK-2241" },
+    { 0x056a0059, "DTH-2242 tablet" },
+    { 0x056a005b, "DTH-2200 [Cintiq 22HD Touch] tablet" },
+    { 0x056a005d, "DTH-2242 touchscreen" },
+    { 0x056a005e, "DTH-2200 [Cintiq 22HD Touch] touchscreen" },
+    { 0x056a0060, "FT-0405 [Volito, PenPartner, PenStation (4x5)]" },
+    { 0x056a0061, "FT-0203 [Volito, PenPartner, PenStation (2x3)]" },
+    { 0x056a0062, "CTF-420 [Volito2]" },
+    { 0x056a0063, "CTF-220 [BizTablet]" },
+    { 0x056a0064, "CTF-221 [PenPartner2]" },
+    { 0x056a0065, "MTE-450 [Bamboo]" },
+    { 0x056a0069, "CTF-430 [Bamboo One]" },
+    { 0x056a006a, "CTE-460 [Bamboo One Pen (S)]" },
+    { 0x056a006b, "CTE-660 [Bamboo One Pen (M)]" },
+    { 0x056a0081, "CTE-630BT [Graphire Wireless (6x8)]" },
     { 0x056a0084, "Wireless adapter for Bamboo tablets" },
     { 0x056a0090, "TPC90" },
     { 0x056a0093, "TPC93" },
+    { 0x056a0097, "TPC97" },
     { 0x056a009a, "TPC9A" },
-    { 0x056a00b0, "Intuos3 4x5" },
-    { 0x056a00b1, "Intuos3 6x18" },
-    { 0x056a00b2, "Intuos3 9x12" },
-    { 0x056a00b3, "Intuos3 12x12" },
-    { 0x056a00b4, "Intuos3 12x19" },
-    { 0x056a00b5, "Intuos3 6x11 (PTZ-631W)" },
-    { 0x056a00b7, "Intuos3 4x6" },
-    { 0x056a00b8, "Intuos4 4x6" },
-    { 0x056a00b9, "Intuos4 6x9" },
-    { 0x056a00ba, "Intuos4 8x13" },
-    { 0x056a00bb, "Intuos4 12x19" },
+    { 0x056a00b0, "PTZ-430 [Intuos3 (4x5)]" },
+    { 0x056a00b1, "PTZ-630 [Intuos3 (6x8)]" },
+    { 0x056a00b2, "PTZ-930 [Intuos3 (9x12)]" },
+    { 0x056a00b3, "PTZ-1230 [Intuos3 (12x12)]" },
+    { 0x056a00b4, "PTZ-1231W [Intuos3 (12x19)]" },
+    { 0x056a00b5, "PTZ-631W [Intuos3 (6x11)]" },
+    { 0x056a00b7, "PTZ-431W [Intuos3 (4x6)]" },
+    { 0x056a00b8, "PTK-440 [Intuos4 (4x6)]" },
+    { 0x056a00b9, "PTK-640 [Intuos4 (6x9)]" },
+    { 0x056a00ba, "PTK-840 [Intuos4 (8x13)]" },
+    { 0x056a00bb, "PTK-1240 [Intuos4 (12x19)]" },
     { 0x056a00c0, "DTF-521" },
     { 0x056a00c4, "DTF-720" },
-    { 0x056a00c5, "Cintiq 20WSX" },
-    { 0x056a00c6, "Cintiq 12WX" },
+    { 0x056a00c5, "DTZ-20WSX [Cintiq 20WSX]" },
+    { 0x056a00c6, "DTZ-12WX [Cintiq 12WX]" },
     { 0x056a00c7, "DTU-1931" },
-    { 0x056a00cc, "Cintiq 21UX (DTK-2100)" },
-    { 0x056a00d1, "Bamboo Pen & Touch (CTH-460-DE)" },
-    { 0x056a00d3, "Bamboo Fun (CTH-661)" },
-    { 0x056a00d4, "Bamboo Pen (CTL-460)" },
-    { 0x056a00d6, "Bamboo Pen & Touch (CTH-460)" },
-    { 0x056a00db, "Bamboo Fun (CTH-661SE-NL)" },
-    { 0x056a00dd, "Bamboo Pen (CTL-470)" },
+    { 0x056a00cc, "DTK-2100 [Cintiq 21UX]" },
+    { 0x056a00ce, "DTU-2231" },
+    { 0x056a00d0, "CTT-460 [Bamboo Touch]" },
+    { 0x056a00d1, "CTH-460 [Bamboo Pen & Touch]" },
+    { 0x056a00d2, "CTH-461 [Bamboo Fun/Craft/Comic Pen & Touch (S)]" },
+    { 0x056a00d3, "CTH-661 [Bamboo Fun/Comic Pen & Touch (M)]" },
+    { 0x056a00d4, "CTL-460 [Bamboo Pen (S)]" },
+    { 0x056a00d5, "CTL-660 [Bamboo Pen (M)]" },
+    { 0x056a00d6, "CTH-460 [Bamboo Pen & Touch]" },
+    { 0x056a00d7, "CTH-461 [Bamboo Fun/Craft/Comic Pen & Touch (S)]" },
+    { 0x056a00d8, "CTH-661 [Bamboo Fun/Comic Pen & Touch (M)]" },
+    { 0x056a00d9, "CTT-460 [Bamboo Touch]" },
+    { 0x056a00da, "CTH-461SE [Bamboo Pen & Touch Special Edition (S)]" },
+    { 0x056a00db, "CTH-661SE [Bamboo Pen & Touch Special Edition (M)]" },
+    { 0x056a00dc, "CTT-470 [Bamboo Touch]" },
+    { 0x056a00dd, "CTL-470 [Bamboo Connect]" },
     { 0x056a00de, "CTH-470 [Bamboo Fun Pen & Touch]" },
-    { 0x056a00f6, "Cintiq 24HD touch (DTH-2400) touchscreen" },
-    { 0x056a00f8, "Cintiq 24HD touch (DTH-2400) tablet" },
-    { 0x056a0302, "Intuos CTH480S2 [Manga]" },
-    { 0x056a0307, "Cintiq Companion Hybrid 13HD (DTH-A1300) tablet" },
-    { 0x056a0309, "Cintiq Companion Hybrid 13HD (DTH-A1300) touchscreen" },
-    { 0x056a030e, "Intuos Pen Small (CTL480)" },
+    { 0x056a00df, "CTH-670 [Bamboo Create/Fun]" },
+    { 0x056a00e2, "TPCE2" },
+    { 0x056a00e3, "TPCE3" },
+    { 0x056a00e5, "TPCE5" },
+    { 0x056a00e6, "TPCE6" },
+    { 0x056a00ec, "TPCEC" },
+    { 0x056a00ed, "TPCED" },
+    { 0x056a00ef, "TPCEF" },
+    { 0x056a00f4, "DTK-2400 [Cintiq 24HD] tablet" },
+    { 0x056a00f6, "DTH-2400 [Cintiq 24HD touch] touchscreen" },
+    { 0x056a00f8, "DTH-2400 [Cintiq 24HD touch] tablet" },
+    { 0x056a00fa, "DTK-2200 [Cintiq 22HD] tablet" },
+    { 0x056a00fb, "DTU-1031" },
+    { 0x056a0100, "TPC100" },
+    { 0x056a0101, "TPC101" },
+    { 0x056a010d, "TPC10D" },
+    { 0x056a010e, "TPC10E" },
+    { 0x056a010f, "TPC10F" },
+    { 0x056a0116, "TPC116" },
+    { 0x056a012c, "TPC12C" },
+    { 0x056a0300, "CTL-471 [Bamboo Splash, One by Wacom (S)]" },
+    { 0x056a0301, "CTL-671 [One by Wacom (M)]" },
+    { 0x056a0302, "CTH-480 [Intuos Pen & Touch (S)]" },
+    { 0x056a0303, "CTH-680 [Intuos Pen & Touch (M)]" },
+    { 0x056a0304, "DTK-1300 [Cintiq 13HD]" },
+    { 0x056a0307, "DTH-A1300 [Cintiq Companion Hybrid] tablet" },
+    { 0x056a0309, "DTH-A1300 [Cintiq Companion Hybrid] touchscreen" },
+    { 0x056a030e, "CTL-480 [Intuos Pen (S)]" },
+    { 0x056a0314, "PTH-451 [Intuos pro (S)]" },
+    { 0x056a0315, "PTH-651 [Intuos pro (M)]" },
+    { 0x056a0317, "PTH-851 [Intuos pro (L)]" },
+    { 0x056a032f, "DTU-1031X" },
     { 0x056a0400, "PenPartner 4x5" },
+    { 0x056a4001, "TPC4001" },
+    { 0x056a4004, "TPC4004" },
     { 0x056a4850, "PenPartner 6x8" },
-    { 0x056a5010, "Thinkpad T550 touchscreen" },
+    { 0x056a5000, "TPC5000" },
+    { 0x056a5002, "TPC5002" },
+    { 0x056a5010, "TPC5010" },
     { 0x056c0006, "KwikLink Host-Host Connector" },
     { 0x056c8007, "Kwik232 Serial Port" },
     { 0x056c8100, "KwikLink Host-Host Connector" },
@@ -9713,6 +9771,7 @@ static const value_string usb_products_vals[] = {
     { 0x058f6386, "Memory Card" },
     { 0x058f6387, "Flash Drive" },
     { 0x058f6390, "USB 2.0-IDE bridge" },
+    { 0x058f6391, "IDE Bridge" },
     { 0x058f9213, "MacAlly Kbd Hub" },
     { 0x058f9215, "AU9814 Hub" },
     { 0x058f9254, "Hub" },
@@ -9727,6 +9786,7 @@ static const value_string usb_products_vals[] = {
     { 0x058f9361, "Multimedia Card Reader" },
     { 0x058f9368, "Multimedia Card Reader" },
     { 0x058f9380, "Flash Drive" },
+    { 0x058f9381, "Flash Drive" },
     { 0x058f9382, "Acer/Sweex Flash drive" },
     { 0x058f9384, "qdi U2Disk T209M" },
     { 0x058f9410, "Keyboard" },
@@ -10023,6 +10083,7 @@ static const value_string usb_products_vals[] = {
     { 0x05ac8242, "Built-in IR Receiver" },
     { 0x05ac8281, "Bluetooth Host Controller" },
     { 0x05ac8286, "Bluetooth Host Controller" },
+    { 0x05ac828c, "Bluetooth Host Controller" },
     { 0x05ac8300, "Built-in iSight (no firmware loaded)" },
     { 0x05ac8403, "Internal Memory Card Reader" },
     { 0x05ac8404, "Internal Memory Card Reader" },
@@ -10132,6 +10193,7 @@ static const value_string usb_products_vals[] = {
     { 0x05ca1810, "Pavilion Webcam [R5U870]" },
     { 0x05ca1812, "Pavilion Webcam" },
     { 0x05ca1814, "HD Webcam" },
+    { 0x05ca1815, "Dell Laptop Integrated Webcam" },
     { 0x05ca1820, "Integrated Webcam" },
     { 0x05ca1830, "Visual Communication Camera VGP-VCC2 [R5U870]" },
     { 0x05ca1832, "Visual Communication Camera VGP-VCC3 [R5U870]" },
@@ -10256,6 +10318,7 @@ static const value_string usb_products_vals[] = {
     { 0x05da20e0, "ScanMaker 9700XL" },
     { 0x05da20ed, "ScanMaker 4700" },
     { 0x05da20ee, "Micortek ScanMaker X12USL" },
+    { 0x05da2838, "RT2832U" },
     { 0x05da3008, "Scanner" },
     { 0x05da300a, "4800 ICE Scanner" },
     { 0x05da300b, "4800 Scanner" },
@@ -13313,6 +13376,33 @@ static const value_string usb_products_vals[] = {
     { 0x0a810701, "USB Missile Launcher" },
     { 0x0a81ff01, "Wireless Missile Launcher" },
     { 0x0a824600, "TravelScan 460/464" },
+    { 0x0a890001, "Guardant Stealth/Net" },
+    { 0x0a890002, "Guardant ID" },
+    { 0x0a890003, "Guardant Stealth 2" },
+    { 0x0a890004, "Rutoken" },
+    { 0x0a890005, "Guardant Fidus" },
+    { 0x0a890006, "Guardant Stealth 3" },
+    { 0x0a890007, "Guardant Stealth 2" },
+    { 0x0a890008, "Guardant Stealth 3 Sign/Time" },
+    { 0x0a890009, "Guardant Code" },
+    { 0x0a89000a, "Guardant Sign Pro" },
+    { 0x0a89000b, "Guardant Sign Pro HID" },
+    { 0x0a89000c, "Guardant Stealth 3 Sign/Time" },
+    { 0x0a89000d, "Guardant Code HID" },
+    { 0x0a89000f, "Guardant System Firmware Update" },
+    { 0x0a890020, "Rutoken S" },
+    { 0x0a890025, "Rutoken lite" },
+    { 0x0a890026, "Rutoken lite HID" },
+    { 0x0a89002a, "Rutoken Mass Storage" },
+    { 0x0a89002b, "Guardant Mass Storage" },
+    { 0x0a890030, "Rutoken ECP" },
+    { 0x0a890040, "Rutoken ECP HID" },
+    { 0x0a890060, "Rutoken Magistra" },
+    { 0x0a890061, "Rutoken Magistra" },
+    { 0x0a890069, "Reader" },
+    { 0x0a890080, "Rutoken PinPad Ex" },
+    { 0x0a890081, "Rutoken PinPad In" },
+    { 0x0a890082, "Rutoken PinPad 2" },
     { 0x0a8e2011, "Filter Driver For JAE XMC R/W" },
     { 0x0a913801, "Targus PAKP003 Mouse" },
     { 0x0a920011, "SYS WaveTerminal U2A" },
@@ -17166,6 +17256,7 @@ static const value_string usb_products_vals[] = {
     { 0x185bd001, "Compro Videomate DVB-U2000 - DVB-T USB warm" },
     { 0x18700001, "iNexio Touchscreen controller" },
     { 0x18710101, "UVC camera (Bresser microscope)" },
+    { 0x18710141, "Camera" },
     { 0x18710d01, "USB2.0 Camera" },
     { 0x1873ee93, "EasyLogger" },
     { 0x187c0511, "AlienFX Mobile lighting" },
@@ -17184,10 +17275,14 @@ static const value_string usb_products_vals[] = {
     { 0x18a50214, "Portable Hard Drive" },
     { 0x18a50216, "External Hard Drive" },
     { 0x18a50218, "External Hard Drive" },
+    { 0x18a50224, "Store 'n' Go Micro Plus" },
     { 0x18a50227, "Pocket Hard Drive" },
     { 0x18a5022b, "Portable Hard Drive (Store'n'Go)" },
-    { 0x18a50237, "Portable Harddrive (500 GB)" },
+    { 0x18a50237, "Portable Harddrive" },
+    { 0x18a50243, "Flash Drive (Store'n'Go)" },
     { 0x18a50302, "Flash Drive" },
+    { 0x18a50304, "Store 'n' Go" },
+    { 0x18a54123, "Store N Go" },
     { 0x18b10037, "Maxter Remote Control" },
     { 0x18b41001, "DUTV007" },
     { 0x18b41002, "EC168 (v5) based USB DVB-T receiver" },
@@ -17198,6 +17293,10 @@ static const value_string usb_products_vals[] = {
     { 0x18c50008, "CG-WLUSB2GNR Corega Wireless USB Adapter" },
     { 0x18c50012, "CG-WLUSB10 Corega Wireless USB Adapter" },
     { 0x18cdcafe, "Pico iMage" },
+    { 0x18d10001, "Onda V972 (storage access)" },
+    { 0x18d10003, "Android-powered device using AllWinner Technology SoC" },
+    { 0x18d10006, "Onda V972 MTP" },
+    { 0x18d10008, "Onda V972 PTP (camera)" },
     { 0x18d105b3, "Google Inc (for Sony) S1" },
     { 0x18d10d02, "Celkon A88" },
     { 0x18d12d00, "Android-powered device in accessory mode" },
@@ -17211,19 +17310,26 @@ static const value_string usb_products_vals[] = {
     { 0x18d14e21, "Google Inc (for Samsung) Nexus S" },
     { 0x18d14e22, "Nexus S (debug)" },
     { 0x18d14e24, "Nexus S (tether)" },
+    { 0x18d14e30, "Galaxy Nexus (fastboot)" },
     { 0x18d14e40, "Nexus 7 (fastboot)" },
     { 0x18d14e41, "Google Inc (for Asus) Nexus 7 (MTP)" },
     { 0x18d14e42, "Google Inc (for Asus) Nexus 7 (MTP+ADB)" },
     { 0x18d14e43, "Nexus 7 (PTP)" },
-    { 0x18d14ee1, "Nexus 4 / 10" },
-    { 0x18d14ee2, "Nexus 4 (debug)" },
-    { 0x18d14ee3, "Nexus 4 (tether)" },
-    { 0x18d14ee4, "Nexus 4 (debug + tether)" },
+    { 0x18d14e44, "Nexus 7 2012 (PTP)" },
+    { 0x18d14ee0, "Nexus 4 (bootloader)" },
+    { 0x18d14ee1, "Nexus Device (MTP)" },
+    { 0x18d14ee2, "Nexus Device (debug)" },
+    { 0x18d14ee3, "Nexus 4/5/7/10 (tether)" },
+    { 0x18d14ee4, "Nexus 4/5/7/10 (debug + tether)" },
+    { 0x18d14ee5, "Nexus 4 (PTP)" },
+    { 0x18d14ee6, "Nexus 4/5 (PTP + debug)" },
     { 0x18d170a8, "Google Inc (for Motorola) Xoom (MZ604)" },
     { 0x18d17102, "Google Inc (for Toshiba) Thrive 7/AT105" },
     { 0x18d1740a, "Google Inc (for Lenovo) Ideapad K1" },
     { 0x18d1b004, "Pandigital / B&N Novel 9\" tablet" },
     { 0x18d1b00a, "Google Inc (for Medion) MD99000 (P9514)" },
+    { 0x18d1d001, "Nexus 4 (fastboot)" },
+    { 0x18d1d002, "Nexus 4 (debug)" },
     { 0x18d1d109, "LG G2x MTP" },
     { 0x18d1d10a, "Google Inc (for LG Electronics) P990/Optimus" },
     { 0x18d901a0, "B-Net 91 07" },
@@ -18148,6 +18254,7 @@ static const value_string usb_products_vals[] = {
     { 0x24066688, "PD7X Portable Storage" },
     { 0x244300dc, "aes220 FPGA Mini-Module" },
     { 0x24782008, "U209-000-R Serial Port" },
+    { 0x248a8366, "Wireless Optical Mouse ACT-MUSW-002" },
     { 0x24e13001, "Adp-usb" },
     { 0x24e13005, "Radius" },
     { 0x26323209, "7-in-1 Card Reader" },