[Automatic manuf, services and enterprise-numbers update for 2014-07-13]

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

1 files changed, 74 insertions, 14 deletions

diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 2ea063e120..2e5446459f 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -1568,7 +1568,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x0cd9, "Hitachi Shin Din Cable, Ltd" },
     { 0x0cde, "Z-Com" },
     { 0x0ce5, "Validation Technologies International" },
-    { 0x0ce9, "pico Technology" },
+    { 0x0ce9, "Pico Technology" },
     { 0x0cf1, "e-Conn Electronic Co., Ltd" },
     { 0x0cf2, "ENE Technology, Inc." },
     { 0x0cf3, "Atheros Communications, Inc." },
@@ -1987,6 +1987,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x1033, "Nucam Corp." },
     { 0x1038, "SteelSeries ApS" },
     { 0x1039, "devolo AG" },
+    { 0x103a, "PSA" },
     { 0x103d, "Stanton" },
     { 0x1043, "iCreate Technologies Corp." },
     { 0x1044, "Chu Yuen Enterprise Co., Ltd" },
@@ -2201,6 +2202,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x131d, "Natural Point" },
     { 0x132a, "Envara Inc." },
     { 0x132b, "Konica Minolta" },
+    { 0x133e, "Kemper Digital GmbH" },
     { 0x1342, "Mobility" },
     { 0x1343, "Citizen Systems" },
     { 0x1345, "Sino Lite Technology Corp." },
@@ -2825,7 +2827,9 @@ static const value_string usb_vendors_vals[] = {
     { 0x2406, "SANHO Digital Electronics Co., Ltd." },
     { 0x2443, "Aessent Technology Ltd" },
     { 0x2478, "Tripp-Lite" },
+    { 0x249c, "M2Tech s.r.l." },
     { 0x2632, "TwinMOS" },
+    { 0x2639, "Xsens" },
     { 0x2650, "Electronics For Imaging, Inc. [hex]" },
     { 0x2659, "Sundtek" },
     { 0x2676, "Basler AG" },
@@ -3074,6 +3078,7 @@ static const value_string usb_products_vals[] = {
     { 0x03f00314, "designjet 30/130 series" },
     { 0x03f00317, "LaserJet 1200" },
     { 0x03f00324, "SK-2885 keyboard" },
+    { 0x03f0034a, "Elite Keyboard" },
     { 0x03f00401, "ScanJet 5200c" },
     { 0x03f00404, "DeskJet 830c/832c" },
     { 0x03f00405, "ScanJet 3400cse" },
@@ -3155,6 +3160,7 @@ static const value_string usb_products_vals[] = {
     { 0x03f01312, "DeskJet 460" },
     { 0x03f01317, "LaserJet 1005" },
     { 0x03f01327, "iLO Virtual Hub" },
+    { 0x03f0134a, "Optical Mouse" },
     { 0x03f01405, "ScanJet 3670" },
     { 0x03f01411, "PSC 750" },
     { 0x03f01424, "f2105 Monitor Hub" },
@@ -3686,6 +3692,8 @@ static const value_string usb_products_vals[] = {
     { 0x0403ed74, "HAMEG HO820 Serial Port" },
     { 0x0403ef10, "FT1245BL" },
     { 0x0403f070, "Serial Converter 422/485 [Vardaan VEUSB422R3]" },
+    { 0x0403f0c8, "SPROG Decoder Programmer" },
+    { 0x0403f0c9, "SPROG-DCC CAN-USB" },
     { 0x0403f0e9, "Tagsys L-P101" },
     { 0x0403f1a0, "Asix PRESTO Programmer" },
     { 0x0403f208, "Papenmeier Braille-Display" },
@@ -3785,6 +3793,7 @@ static const value_string usb_products_vals[] = {
     { 0x04090249, "Aterm WL300NU-G" },
     { 0x040902b4, "Aterm WL300NU-AG" },
     { 0x040902b6, "Aterm WL300NU-GS 802.11n Wireless Adapter" },
+    { 0x040902bc, "Computer Monitor" },
     { 0x04090300, "LifeTouch Note" },
     { 0x04090301, "LifeTouch Note (debug mode)" },
     { 0x040955aa, "Hub" },
@@ -4684,6 +4693,7 @@ static const value_string usb_products_vals[] = {
     { 0x04520021, "HID Monitor Controls" },
     { 0x04520050, "Diamond Pro 900u CRT Monitor" },
     { 0x04520051, "Integrated Hub" },
+    { 0x04520100, "Control Panel for Leica TCS SP5" },
     { 0x04536781, "NMB Keyboard" },
     { 0x04536783, "Chicony Composite Keyboard" },
     { 0x0456f000, "FT2232 JTAG ICE [gnICE]" },
@@ -5801,6 +5811,7 @@ static const value_string usb_products_vals[] = {
     { 0x0480a007, "External Disk USB 3.0" },
     { 0x0480a009, "Stor.E Basics" },
     { 0x0480a00d, "STOR.E BASICS 500GB" },
+    { 0x0480b001, "Stor.E Partner" },
     { 0x0480d010, "External Disk 3TB" },
     { 0x0482000e, "FS-1020D Printer" },
     { 0x0482000f, "FS-1920 Mono Printer" },
@@ -7269,12 +7280,15 @@ static const value_string usb_products_vals[] = {
     { 0x04d89004, "Microchip REAL ICE" },
     { 0x04d8900a, "PICkit3" },
     { 0x04d8c001, "PicoLCD 20x4" },
+    { 0x04d8f4b5, "SmartScope" },
     { 0x04d8f8da, "Hughski Ltd. ColorHug" },
+    { 0x04d8f91c, "SPROG IIv3" },
     { 0x04d8faff, "Dangerous Prototypes BusPirate v4 Bootloader mode" },
     { 0x04d8fb00, "Dangerous Prototypes BusPirate v4" },
     { 0x04d8fbb2, "GCUSB-nStep stepper motor controller" },
     { 0x04d8fbba, "DiscFerret Magnetic Disc Analyser (bootloader mode)" },
     { 0x04d8fbbb, "DiscFerret Magnetic Disc Analyser (active mode)" },
+    { 0x04d8fc1e, "Bachrus Speedometer Interface" },
     { 0x04d8fc92, "Open Bench Logic Sniffer" },
     { 0x04d8ffef, "PICoPLC [APStech]" },
     { 0x04d90022, "Portable Keyboard" },
@@ -7722,6 +7736,7 @@ static const value_string usb_products_vals[] = {
     { 0x04f20402, "Genius LuxeMate i200 Keyboard" },
     { 0x04f20403, "KU-0420 keyboard" },
     { 0x04f20418, "KU-0418 Tactical Pad" },
+    { 0x04f20618, "RG-0618U Wireless HID Receiver & KG-0609 Wireless Keyboard with Touchpad" },
     { 0x04f20760, "Acer KU-0760 Keyboard" },
     { 0x04f20841, "HP Multimedia Keyboard" },
     { 0x04f20860, "2.4G Multimedia Wireless Kit" },
@@ -8013,7 +8028,7 @@ static const value_string usb_products_vals[] = {
     { 0x04fc0015, "ViewMate Desktop Mouse CC2201" },
     { 0x04fc00d3, "00052486 / Laser Mouse M1052 [hama]" },
     { 0x04fc0171, "SPCA1527A/SPCA1528 SD card camera (Mass Storage mode)" },
-    { 0x04fc0201, "RS232C Adapter" },
+    { 0x04fc0201, "SPCP825 RS232C Adapter" },
     { 0x04fc0232, "Fingerprint" },
     { 0x04fc0538, "Wireless Optical Mouse 2.4G [Bright]" },
     { 0x04fc0561, "Flexcam 100" },
@@ -11938,6 +11953,7 @@ static const value_string usb_products_vals[] = {
     { 0x08e30301, "RNIS" },
     { 0x08e40142, "Pioneer DVR-LX60D" },
     { 0x08e40148, "Pioneer XMP3" },
+    { 0x08e40185, "DDJ-WeGO2" },
     { 0x08e60001, "GemPC-Touch 430" },
     { 0x08e60430, "GemPC430 SmartCard Reader" },
     { 0x08e60432, "GemPC432 SmartCard Reader" },
@@ -12983,6 +12999,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" },
+    { 0x0b483014, "TT-TVStick CT2-4400" },
     { 0x0b49064f, "Trance Vibrator" },
     { 0x0b4b0100, "D'music MP3 Player" },
     { 0x0b4d110a, "Graphtec CC200-20" },
@@ -13254,7 +13271,7 @@ static const value_string usb_products_vals[] = {
     { 0x0bc22320, "USB 3.0 bridge [Portable Expansion Drive]" },
     { 0x0bc23008, "FreeAgent Desk 1TB" },
     { 0x0bc23101, "FreeAgent XTreme 640GB" },
-    { 0x0bc23312, "SRD00F2 [Expansion Desktop Drive 2TB]" },
+    { 0x0bc23312, "SRD00F2 Expansion Desktop Drive (STBV)" },
     { 0x0bc23320, "SRD00F2 [Expansion Desktop Drive]" },
     { 0x0bc23332, "Expansion" },
     { 0x0bc25020, "FreeAgent GoFlex" },
@@ -13262,6 +13279,7 @@ static const value_string usb_products_vals[] = {
     { 0x0bc25030, "FreeAgent GoFlex Upgrade Cable STAE104" },
     { 0x0bc25031, "FreeAgent GoFlex USB 3.0" },
     { 0x0bc25070, "FreeAgent GoFlex Desk" },
+    { 0x0bc25071, "FreeAgent GoFlex Desk" },
     { 0x0bc250a1, "FreeAgent GoFlex Desk" },
     { 0x0bc250a5, "FreeAgent GoFlex Desk USB 3.0" },
     { 0x0bc25121, "FreeAgent GoFlex" },
@@ -13270,6 +13288,7 @@ static const value_string usb_products_vals[] = {
     { 0x0bc2a0a1, "Backup Plus Desktop" },
     { 0x0bc2a0a4, "Backup Plus Desktop Drive" },
     { 0x0bc2ab00, "Slim Portable Drive" },
+    { 0x0bc2ab20, "Backup Plus Portable Drive" },
     { 0x0bc30001, "UMTS-TDD (TD-CDMA) modem" },
     { 0x0bc70001, "ActiveHome (ACPI-compliant)" },
     { 0x0bc70002, "Firecracker Interface (ACPI-compliant)" },
@@ -13315,6 +13334,7 @@ static const value_string usb_products_vals[] = {
     { 0x0bda0171, "Mass Storage Device" },
     { 0x0bda0176, "Mass Storage Device" },
     { 0x0bda0178, "Mass Storage Device" },
+    { 0x0bda0179, "RTL8188ETV Wireless LAN 802.11n Network Adapter" },
     { 0x0bda0184, "RTS5182 Card Reader" },
     { 0x0bda0186, "Card Reader" },
     { 0x0bda0301, "multicard reader" },
@@ -13322,6 +13342,7 @@ static const value_string usb_products_vals[] = {
     { 0x0bda2831, "RTL2831U DVB-T" },
     { 0x0bda2832, "RTL2832U DVB-T" },
     { 0x0bda2838, "RTL2838 DVB-T" },
+    { 0x0bda5730, "HP 2.0MP High Definition Webcam" },
     { 0x0bda8150, "RTL8150 Fast Ethernet Adapter" },
     { 0x0bda8151, "RTL8151 Adapteon Business Mobile Networks BV" },
     { 0x0bda8171, "RTL8188SU 802.11n WLAN Adapter" },
@@ -13745,6 +13766,20 @@ static const value_string usb_products_vals[] = {
     { 0x0cde0027, "Sphairon Homelink 1202 802.11n Wireless Adapter [Atheros AR9170]" },
     { 0x0ce50003, "Matrix" },
     { 0x0ce91001, "PicoScope3000 series PC Oscilloscope" },
+    { 0x0ce91007, "PicoScope 2000 series PC Oscilloscope" },
+    { 0x0ce91008, "PicoScope 5000 series PC Oscilloscope" },
+    { 0x0ce91009, "PicoScope 4000 series PC Oscilloscope" },
+    { 0x0ce9100e, "PicoScope 6000 series PC Oscilloscope" },
+    { 0x0ce91012, "PicoScope 3000A series PC Oscilloscope" },
+    { 0x0ce91016, "PicoScope 2000A series PC Oscilloscope" },
+    { 0x0ce91018, "PicoScope 4000A series PC Oscilloscope" },
+    { 0x0ce91200, "PicoScope 2000 series PC Oscilloscope" },
+    { 0x0ce91201, "PicoScope 3000 series PC Oscilloscope" },
+    { 0x0ce91202, "PicoScope 4000 series PC Oscilloscope" },
+    { 0x0ce91203, "PicoScope 5000 series PC Oscilloscope" },
+    { 0x0ce91204, "PicoScope 6000 series PC Oscilloscope" },
+    { 0x0ce91211, "PicoScope 3000 series PC Oscilloscope" },
+    { 0x0ce91212, "PicoScope 4000 series PC Oscilloscope" },
     { 0x0cf26220, "SD Card Reader (SG361)" },
     { 0x0cf26225, "SD card reader (UB6225)" },
     { 0x0cf26250, "SD card reader (UB6250)" },
@@ -13954,6 +13989,7 @@ static const value_string usb_products_vals[] = {
     { 0x0dab0100, "DVR/CVR-M140 MP3 Player" },
     { 0x0db01020, "PC2PC WLAN Card" },
     { 0x0db01967, "Bluetooth Dongle" },
+    { 0x0db03713, "Primo 73" },
     { 0x0db03801, "Motorola Bluetooth 2.1+EDR Device" },
     { 0x0db04011, "Medion Flash XL V2.0 Card Reader" },
     { 0x0db04023, "Lexar Mobile Card Reader" },
@@ -13987,6 +14023,7 @@ static const value_string usb_products_vals[] = {
     { 0x0db0b970, "Bluetooth EDR Device" },
     { 0x0db0b97a, "Bluetooth EDR Device" },
     { 0x0db70002, "Goldpfeil P-LAN" },
+    { 0x0dba1000, "Mbox 1 [Mbox]" },
     { 0x0dba3000, "Mbox 2" },
     { 0x0dbc0003, "AND Serial Cable [AND Smart Cable]" },
     { 0x0dbf0002, "SmartDongle Security Key" },
@@ -14193,6 +14230,8 @@ static const value_string usb_products_vals[] = {
     { 0x0e66400c, "UF100 Ethernet [pegasus2]" },
     { 0x0e670002, "Wrist PDA" },
     { 0x0e6a0101, "MA100 [USB-UART Bridge IC]" },
+    { 0x0e6a030b, "Truly Ergonomic Computer Keyboard (Device Firmware Update mode)" },
+    { 0x0e6a030c, "Truly Ergonomic Computer Keyboard" },
     { 0x0e6a6001, "GEMBIRD Flexible keyboard KB-109F-B-DE" },
     { 0x0e6f0003, "Freebird wireless Controller" },
     { 0x0e6f0005, "Eclipse wireless Controller" },
@@ -14631,6 +14670,7 @@ static const value_string usb_products_vals[] = {
     { 0x10381361, "Ideazon Sensei" },
     { 0x10390824, "1866 802.11bg [Texas Instruments TNETW1450]" },
     { 0x10392140, "dsl+ 1100 duo" },
+    { 0x103af000, "Actia Evo XS" },
     { 0x103d0100, "ScratchAmp" },
     { 0x103d0101, "ScratchAmp" },
     { 0x10421143, "iRiver T7 Volcano" },
@@ -14670,6 +14710,7 @@ static const value_string usb_products_vals[] = {
     { 0x10500010, "Yubikey" },
     { 0x10500110, "Yubikey NEO OTP" },
     { 0x10500111, "Yubikey NEO OTP+CCID" },
+    { 0x10500200, "U2F Gnubby" },
     { 0x10500211, "Gnubby" },
     { 0x10545004, "DSL 7420 Loader" },
     { 0x10545005, "DSL 7420 LAN Modem" },
@@ -14678,24 +14719,27 @@ static const value_string usb_products_vals[] = {
     { 0x10580500, "hub" },
     { 0x10580702, "Passport External HDD" },
     { 0x10580704, "Passport External HDD" },
-    { 0x1058070a, "My Passport Essential SE, My Passport for Mac (WDBAAB)" },
-    { 0x1058071a, "My Passport" },
+    { 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)" },
-    { 0x10580740, "My Passport" },
+    { 0x10580740, "My Passport Essential (WDBACY)" },
     { 0x10580741, "My Passport Ultra" },
     { 0x10580742, "My Passport Essential SE" },
     { 0x10580748, "My Passport (WDBKXH)" },
-    { 0x10580810, "My Passport Ultra" },
+    { 0x10580810, "My Passport Ultra (WDBZFP)" },
     { 0x10580900, "MyBook Essential External HDD" },
-    { 0x10580901, "My Book Essential Edition (Green Ring)" },
-    { 0x10580902, "My Book Pro Edition" },
+    { 0x10580901, "My Book Essential Edition (Green Ring) (WDG1U)" },
+    { 0x10580902, "My Book Pro Edition (WDG1T)" },
     { 0x10580903, "My Book Premium Edition" },
-    { 0x10580910, "MyBook Essential External HDD" },
+    { 0x10580910, "My Book Essential Edition (Green Ring) (WDG1U)" },
     { 0x10581001, "Elements Desktop (WDE1U)" },
     { 0x10581003, "Elements 1000 GB" },
     { 0x10581010, "Elements Portable (WDBAAR)" },
     { 0x10581021, "Elements Desktop (WDBAAU)" },
-    { 0x10581023, "Elements SE" },
+    { 0x10581023, "Elements SE Portable (WDBABV)" },
     { 0x10581048, "Elements Portable (WDBU6Y)" },
     { 0x105810a2, "Elements SE Portable (WDBPCK)" },
     { 0x105810a8, "Elements Portable (WDBUZG)" },
@@ -14703,8 +14747,12 @@ static const value_string usb_products_vals[] = {
     { 0x10581103, "My Book Studio" },
     { 0x10581104, "MyBook Mirror Edition External HDD" },
     { 0x10581105, "My Book Studio II" },
-    { 0x10581123, "My Book 3.0" },
-    { 0x10581140, "My Book Essential USB3.0" },
+    { 0x10581110, "My Book Essential (WDBAAF), My Book for Mac (WDBAAG)" },
+    { 0x10581111, "My Book Elite (WDBAAH)" },
+    { 0x10581112, "My Book Studio (WDBAAJ), My Book Studio LX (WDBACH)" },
+    { 0x10581123, "My Book 3.0 (WDBABP)" },
+    { 0x10581130, "My Book Essential (WDBACW)" },
+    { 0x10581140, "My Book Essential (WDBACW)" },
     { 0x1059000b, "StarSign Bio Token 3.0" },
     { 0x10631555, "MC141555 Hub" },
     { 0x10634100, "SB4100 USB Cable Modem" },
@@ -15276,6 +15324,7 @@ static const value_string usb_products_vals[] = {
     { 0x132b2043, "Magicolor 2530DL" },
     { 0x132b2045, "Magicolor 2500W" },
     { 0x132b2049, "Magicolor 2490MF" },
+    { 0x133e0815, "Virus TI Desktop" },
     { 0x13420200, "EasiDock 200 Hub" },
     { 0x13420201, "EasiDock 200 Keyboard and Mouse Port" },
     { 0x13420202, "EasiDock 200 Serial Port" },
@@ -15303,9 +15352,10 @@ static const value_string usb_products_vals[] = {
     { 0x134c0002, "Touch Panel Controller" },
     { 0x134c0003, "Touch Panel Controller" },
     { 0x134c0004, "Touch Panel Controller" },
+    { 0x13570089, "OpenSDA - CDC Serial Port" },
     { 0x13570503, "USB-ML-12 HCS08/HCS12 Multilink" },
     { 0x13570504, "DEMOJM" },
-    { 0x13660101, "J-Link ARM" },
+    { 0x13660101, "J-Link PLUS" },
     { 0x13700323, "Swissmemory cirrusWHITE" },
     { 0x13706828, "Victorinox Flash Drive" },
     { 0x13710001, "CNUSB-611AR Wireless Adapter-G [AT76C503]" },
@@ -15331,6 +15381,7 @@ static const value_string usb_products_vals[] = {
     { 0x138a0018, "Fingerprint scanner" },
     { 0x138a003c, "VFS471 Fingerprint Reader" },
     { 0x138a003d, "VFS491" },
+    { 0x138a003f, "VFS495 Fingerprint Reader" },
     { 0x138a0050, "Swipe Fingerprint Sensor" },
     { 0x138e9000, "Raisonance S.A. STM32 ARM evaluation board" },
     { 0x13900001, "GO 520 T/GO 630/ONE XL (v9)" },
@@ -15426,6 +15477,7 @@ static const value_string usb_products_vals[] = {
     { 0x13d35116, "Integrated Webcam" },
     { 0x13d35122, "2M Integrated Webcam" },
     { 0x13d35126, "PC Cam" },
+    { 0x13d35130, "Integrated Webcam" },
     { 0x13d35702, "UVC VGA Webcam" },
     { 0x13d35710, "UVC VGA Webcam" },
     { 0x13d35716, "UVC VGA Webcam" },
@@ -15573,6 +15625,7 @@ static const value_string usb_products_vals[] = {
     { 0x14930010, "Bluebird [Ambit]" },
     { 0x14930019, "Duck [Ambit2]" },
     { 0x1493001a, "Colibri [Ambit2 S]" },
+    { 0x1493001d, "Greentit [Ambit2 R]" },
     { 0x1498a090, "DVB-T Tuner" },
     { 0x149a2107, "DBX1 DSP core" },
     { 0x14aa0001, "Avermedia AverTV DVBT USB1.1 (cold)" },
@@ -17207,6 +17260,13 @@ static const value_string usb_products_vals[] = {
     { 0x244300dc, "aes220 FPGA Mini-Module" },
     { 0x24782008, "U209-000-R Serial Port" },
     { 0x26323209, "7-in-1 Card Reader" },
+    { 0x26390001, "MTi-10 IMU" },
+    { 0x26390002, "MTi-20 VRU" },
+    { 0x26390003, "MTi-30 AHRS" },
+    { 0x26390011, "MTi-100 IMU" },
+    { 0x26390012, "MTi-200 VRU" },
+    { 0x26390013, "MTi-300 AHRS" },
+    { 0x26390017, "MTi-G-700 GPS INS" },
     { 0x26591101, "TNT DVB-T/DAB/DAB+/FM" },
     { 0x26591201, "FM Transmitter/Receiver" },
     { 0x26591202, "MediaTV Analog/FM/DVB-T" },