[Automatic manuf, services and enterprise-numbers update for 2015-03-22]

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

1 files changed, 70 insertions, 15 deletions

diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 3760f5b56a..4a33cb7ec4 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -788,6 +788,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x073c, "Industrial Electronic Engineers, Inc." },
     { 0x073d, "Eutron S.p.a." },
     { 0x073e, "NEC, Inc." },
+    { 0x0742, "Stollmann" },
     { 0x0745, "Syntech Information Co., Ltd" },
     { 0x0746, "Onkyo Corp." },
     { 0x0747, "Labway Corp." },
@@ -2009,6 +2010,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x1057, "ON Semiconductor" },
     { 0x1058, "Western Digital Technologies, Inc." },
     { 0x1059, "Giesecke & Devrient GmbH" },
+    { 0x105b, "Foxconn International, Inc." },
     { 0x105c, "Hong Ji Electric Wire & Cable (Dongguan) Co., Ltd" },
     { 0x105d, "Delkin Devices, Inc." },
     { 0x105e, "Valence Semiconductor Design, Ltd" },
@@ -2061,6 +2063,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x10ce, "Silicon Labs" },
     { 0x10cf, "Velleman Components, Inc." },
     { 0x10d1, "Hottinger Baldwin Measurement" },
+    { 0x10d2, "RayComposer - R. Adams" },
     { 0x10d4, "Man Boon Manufactory, Ltd" },
     { 0x10d5, "Uni Class Technology Co., Ltd" },
     { 0x10d6, "Actions Semiconductor Co., Ltd" },
@@ -2311,7 +2314,6 @@ static const value_string usb_vendors_vals[] = {
     { 0x14dd, "Raritan Computer, Inc." },
     { 0x14e0, "WiNRADiO Communications" },
     { 0x14e1, "Dialogue Technology Corp." },
-    { 0x14e4, "Broadcom Corp." },
     { 0x14e5, "SAIN Information & Communications Co., Ltd." },
     { 0x14ea, "Planex Communications" },
     { 0x14ed, "Shure Inc." },
@@ -2329,6 +2331,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x1527, "Silicon Portals" },
     { 0x1529, "UBIQUAM Co., Ltd." },
     { 0x152a, "Thesycon Systemsoftware & Consulting GmbH" },
+    { 0x152b, "FLYTECH Technology CO Ltd" },
     { 0x152d, "JMicron Technology Corp. / JMicron USA Technology Corp." },
     { 0x152e, "LG (HLDS)" },
     { 0x1532, "Razer USA, Ltd" },
@@ -3436,6 +3439,7 @@ static const value_string usb_products_vals[] = {
     { 0x03f05912, "Officejet Pro 8600" },
     { 0x03f05a11, "PhotoSmart C7100 series" },
     { 0x03f05b11, "OfficeJet J2100 series" },
+    { 0x03f05b12, "Officejet Pro 8100" },
     { 0x03f05c11, "PhotoSmart C4200 Printer series" },
     { 0x03f05c12, "OfficeJet 6700" },
     { 0x03f05c17, "LaserJet P2055 series" },
@@ -7398,6 +7402,7 @@ static const value_string usb_products_vals[] = {
     { 0x04d91503, "Shortboard Lefty" },
     { 0x04d91603, "Keyboard" },
     { 0x04d91702, "Keyboard LKS02" },
+    { 0x04d92011, "Keyboard [Diatec Filco Majestouch 1]" },
     { 0x04d92013, "Keyboard [Das Keyboard]" },
     { 0x04d92221, "Keyboard" },
     { 0x04d92323, "Keyboard" },
@@ -8850,6 +8855,7 @@ static const value_string usb_products_vals[] = {
     { 0x056a030e, "Intuos Pen Small (CTL480)" },
     { 0x056a0400, "PenPartner 4x5" },
     { 0x056a4850, "PenPartner 6x8" },
+    { 0x056a5010, "Thinkpad T550 touchscreen" },
     { 0x056c0006, "KwikLink Host-Host Connector" },
     { 0x056c8007, "Kwik232 Serial Port" },
     { 0x056c8100, "KwikLink Host-Host Connector" },
@@ -8895,6 +8901,7 @@ static const value_string usb_products_vals[] = {
     { 0x0572c686, "Geniatech T220A DVB-T2 TV Stick" },
     { 0x0572c688, "Geniatech T230 DVB-T2 TV Stick" },
     { 0x0572cafc, "CX861xx ROM Boot Loader" },
+    { 0x0572cafd, "CX82310 ROM Boot Loader" },
     { 0x0572cafe, "AccessRunner ADSL Modem" },
     { 0x0572cb00, "ADSL Modem" },
     { 0x0572cb01, "ADSL Modem" },
@@ -9241,8 +9248,10 @@ static const value_string usb_products_vals[] = {
     { 0x0585000e, "Digital Camera" },
     { 0x0585000f, "Digital Camera" },
     { 0x05860025, "802.11b/g/n USB Wireless Network Adapter" },
-    { 0x05860102, "omni.net II ISDN TA" },
-    { 0x05861000, "Omni NET Modem / ISDN TA" },
+    { 0x05860100, "omni.net" },
+    { 0x05860102, "omni.net II ISDN TA [HFC-S]" },
+    { 0x05860110, "omni.net Plus" },
+    { 0x05861000, "omni.net LCD Plus - ISDN TA" },
     { 0x05861500, "Omni 56K Plus" },
     { 0x05862011, "Scorpion-980N keyboard" },
     { 0x05863304, "LAN Modem" },
@@ -9444,6 +9453,7 @@ static const value_string usb_products_vals[] = {
     { 0x05a92800, "SuperCAM" },
     { 0x05a94519, "Webcam Classic" },
     { 0x05a97670, "OV7670 Webcam" },
+    { 0x05a98065, "GAIA Sensor FPGA Demo Board" },
     { 0x05a98519, "OV519 Webcam" },
     { 0x05a9a511, "OV511+ Webcam" },
     { 0x05a9a518, "D-Link DSB-C310 Webcam" },
@@ -10207,6 +10217,7 @@ static const value_string usb_products_vals[] = {
     { 0x064703eb, "Inspectrum 128x1024 B VIS Spectrograph" },
     { 0x064703ec, "Inspectrum 256x1024 B VIS Spectrograph" },
     { 0x064b0165, "Blackfin 535 [ADZS HPUSB ICE]" },
+    { 0x064e2100, "Sony Visual Communication Camera" },
     { 0x064ea100, "Acer OrbiCam" },
     { 0x064ea101, "Acer CrystalEye Webcam" },
     { 0x064ea102, "Acer/Lenovo Webcam [CN0316]" },
@@ -10382,8 +10393,8 @@ static const value_string usb_products_vals[] = {
     { 0x06750110, "Vigor 128 ISDN TA" },
     { 0x06750530, "Vigor530 IEEE 802.11G Adapter (ISL3880+NET2280)" },
     { 0x06750550, "Vigor550" },
-    { 0x06751688, "miniVigor 128 ISDN TA" },
-    { 0x06756694, "USB ISDN TA" },
+    { 0x06751688, "miniVigor 128 ISDN TA [HFC-S]" },
+    { 0x06756694, "miniVigor 128 ISDN TA" },
     { 0x067707d5, "TM-ED1285(USB)" },
     { 0x06770fa1, "TD-U8000 Tape Drive" },
     { 0x067b0000, "PL2301 USB-USB Bridge" },
@@ -10964,8 +10975,9 @@ static const value_string usb_products_vals[] = {
     { 0x071b0301, "SB-USB JTAG Emulator" },
     { 0x071b3203, "Rockchip Media Player" },
     { 0x071b32bb, "Music Mediatouch" },
-    { 0x071d1000, "Diva ISDN TA" },
-    { 0x071d1003, "Diva" },
+    { 0x071d1000, "Diva 2.01 S/T [PSB2115F]" },
+    { 0x071d1003, "Diva ISDN 2.0" },
+    { 0x071d1005, "Diva ISDN 4.0 [HFC-S]" },
     { 0x071d2000, "Teledat Surf" },
     { 0x07230002, "Palladia 300/400 Adsl Modem" },
     { 0x07291000, "USC-1000 Serial Port" },
@@ -11072,6 +11084,9 @@ static const value_string usb_products_vals[] = {
     { 0x073d0c00, "Pocket Reader" },
     { 0x073d0d00, "StarSign Bio Token 3.0 EU" },
     { 0x073e0301, "Game Pad" },
+    { 0x07422008, "ISDN TA [HFC-S]" },
+    { 0x07422009, "ISDN TA [HFC-S]" },
+    { 0x0742200a, "ISDN TA [HFC-S]" },
     { 0x07465500, "SE-U55 Audio Device" },
     { 0x074d3553, "Composite USB-Device" },
     { 0x074d3554, "Composite USB-Device" },
@@ -11394,8 +11409,8 @@ static const value_string usb_products_vals[] = {
     { 0x07b00002, "ISDN TA128 Plus" },
     { 0x07b00003, "ISDN TA128 Deluxe" },
     { 0x07b00005, "ISDN TA128 SE" },
-    { 0x07b00006, "ISDN TA128 CE" },
-    { 0x07b00007, "ISDN TA" },
+    { 0x07b00006, "ISDN TA 128 [HFC-S]" },
+    { 0x07b00007, "ISDN TA [HFC-S]" },
     { 0x07b00008, "ISDN TA" },
     { 0x07b20100, "SURFboard Voice over IP Cable Modem" },
     { 0x07b20900, "SURFboard Gateway" },
@@ -11745,6 +11760,8 @@ static const value_string usb_products_vals[] = {
     { 0x07f70005, "ScanLogic/Century Corporation uATA" },
     { 0x07f7011e, "Century USB Disk Enclosure" },
     { 0x07fa0778, "miniVigor 128 ISDN TA" },
+    { 0x07fa0846, "ISDN TA [HFC-S]" },
+    { 0x07fa0847, "ISDN TA [HFC-S]" },
     { 0x07fa1012, "BeWAN ADSL USB ST (grey)" },
     { 0x07fa1196, "BWIFI-USB54AR 802.11bg" },
     { 0x07faa904, "BeWAN ADSL" },
@@ -12128,7 +12145,7 @@ static const value_string usb_products_vals[] = {
     { 0x08e30100, "Interface ADSL" },
     { 0x08e30101, "Interface ADSL" },
     { 0x08e30102, "ADSL" },
-    { 0x08e30301, "RNIS" },
+    { 0x08e30301, "RNIS ISDN TA [HFC-S]" },
     { 0x08e40142, "Pioneer DVR-LX60D" },
     { 0x08e40148, "Pioneer XMP3" },
     { 0x08e40184, "DDJ-WeGO" },
@@ -12583,7 +12600,7 @@ static const value_string usb_products_vals[] = {
     { 0x09571745, "Test and Measurement Device (IVI)" },
     { 0x09572918, "U2702A oscilloscope" },
     { 0x0957fb18, "LC Device" },
-    { 0x09592bd0, "Intelligent ISDN (Ver. 3.60.04)" },
+    { 0x09592bd0, "Intelligent ISDN (Ver. 3.60.04) [HFC-S]" },
     { 0x095a3003, "Express Ethernet" },
     { 0x095d0001, "Polycom ViaVideo" },
     { 0x09670204, "WarpLink 802.11b Adapter" },
@@ -12730,6 +12747,7 @@ static const value_string usb_products_vals[] = {
     { 0x0a170015, "Optio S40/S5i" },
     { 0x0a17003b, "Optio 50 (mass storage mode)" },
     { 0x0a17003d, "Optio S55" },
+    { 0x0a170041, "Optio S5z" },
     { 0x0a170043, "*ist DL" },
     { 0x0a170047, "Optio S60" },
     { 0x0a170052, "Optio 60 Digital Camera" },
@@ -14355,6 +14373,7 @@ static const value_string usb_products_vals[] = {
     { 0x0df62200, "Sitecom bluetooth2.0 class 2 dongle CN-512" },
     { 0x0df62208, "Sitecom bluetooth2.0 class 2 dongle CN-520" },
     { 0x0df62209, "Sitecom bluetooth2.0 class 1 dongle CN-521" },
+    { 0x0df63068, "DC-104v2 ISDN Adapter [HFC-S]" },
     { 0x0df69071, "WL-113 rev 1 Wireless Network USB Adapter" },
     { 0x0df69075, "WL-117 Hi-Speed USB Adapter" },
     { 0x0df690ac, "WL-172 Wireless Network USB Adapter 54g Turbo" },
@@ -14956,6 +14975,8 @@ static const value_string usb_products_vals[] = {
     { 0x10500113, "Yubikey NEO(-N) U2F" },
     { 0x10500114, "Yubikey NEO(-N) OTP+U2F" },
     { 0x10500115, "Yubikey NEO(-N) U2F+CCID" },
+    { 0x10500116, "Yubikey NEO(-N) OTP+U2F+CCID" },
+    { 0x10500120, "Yubikey Touch U2F Security Key" },
     { 0x10500200, "U2F Gnubby" },
     { 0x10500211, "Gnubby" },
     { 0x10545004, "DSL 7420 Loader" },
@@ -14981,6 +15002,7 @@ static const value_string usb_products_vals[] = {
     { 0x105807a8, "My Passport (WDBBEP), My Passport for Mac (WDBLUZ)" },
     { 0x10580810, "My Passport Ultra (WDBZFP)" },
     { 0x10580820, "My Passport Ultra (WDBMWV, WDBZFP)" },
+    { 0x10580830, "My Passport Ultra (WDBZFP)" },
     { 0x10580900, "MyBook Essential External HDD" },
     { 0x10580901, "My Book Essential Edition (Green Ring) (WDG1U)" },
     { 0x10580902, "My Book Pro Edition (WDG1T)" },
@@ -15010,6 +15032,7 @@ static const value_string usb_products_vals[] = {
     { 0x10581140, "My Book Essential (WDBACW)" },
     { 0x10581230, "My Book (WDBFJK0030HBK)" },
     { 0x1059000b, "StarSign Bio Token 3.0" },
+    { 0x105be065, "BCM43142A0 Bluetooth module" },
     { 0x10631555, "MC141555 Hub" },
     { 0x10634100, "SB4100 USB Cable Modem" },
     { 0x10650020, "USB-DVR2 Dev Board" },
@@ -15094,6 +15117,7 @@ static const value_string usb_products_vals[] = {
     { 0x107b55f2, "WGU-210 802.11g Adapter [Intersil ISL3886]" },
     { 0x1083161b, "DR-2010C Scanner" },
     { 0x1083162c, "P-150 Scanner" },
+    { 0x108b0005, "HID Keyboard/Mouse PS/2 Translator" },
     { 0x109b9118, "Medion P4013 Mobile" },
     { 0x109f3163, "Trigem Mobile SmartDisplay84" },
     { 0x109f3164, "Trigem Mobile SmartDisplay121" },
@@ -15179,7 +15203,8 @@ 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]" },
+    { 0x10c48973, "C8051F38x HDMI Extender [UHBX-8X]" },
+    { 0x10c489e1, "C8051F38x HDMI Extender [UHBX-SW3-WP]" },
     { 0x10c4ea60, "CP210x UART Bridge / myAVR mySmartUSB light" },
     { 0x10c4ea61, "CP210x UART Bridge" },
     { 0x10c4ea70, "CP210x UART Bridge" },
@@ -15196,9 +15221,11 @@ static const value_string usb_products_vals[] = {
     { 0x10d10101, "USB-Module for Spider8, CP32" },
     { 0x10d10202, "CP22 - Communication Processor" },
     { 0x10d10301, "CP42 - Communication Processor" },
+    { 0x10d25243, "RayComposer" },
     { 0x10d50004, "PS/2 Converter" },
     { 0x10d55552, "KVM Human Interface Composite Device (Keyboard/Mouse ports)" },
     { 0x10d555a2, "2Port KVMSwitcher" },
+    { 0x10d60c02, "BioniQ 1001 Tablet" },
     { 0x10d61000, "MP3 Player" },
     { 0x10d61100, "MPMan MP-Ki 128 MP3 Player/Recorder" },
     { 0x10d61101, "D-Wave 2GB MP4 Player / AK1025 MP3/MP4 Player" },
@@ -15246,6 +15273,7 @@ static const value_string usb_products_vals[] = {
     { 0x1113a0a2, "Active Sync device" },
     { 0x112a0001, "RedRat3 IR Transceiver" },
     { 0x112a0005, "RedRat3II IR Transceiver" },
+    { 0x11300001, "BlyncLight" },
     { 0x11300002, "iBuddy" },
     { 0x11300202, "Rocket Launcher" },
     { 0x11306604, "MCE IR-Receiver" },
@@ -15686,6 +15714,7 @@ static const value_string usb_products_vals[] = {
     { 0x138e9000, "Raisonance S.A. STM32 ARM evaluation board" },
     { 0x13900001, "GO 520 T/GO 630/ONE XL (v9)" },
     { 0x13905454, "Blue & Me 2" },
+    { 0x13907474, "GPS Sport Watch [Runner, Multi-Sport]" },
     { 0x13911000, "URTC-1000" },
     { 0x13953556, "USB Headset" },
     { 0x139700bc, "BCF2000" },
@@ -15768,6 +15797,7 @@ static const value_string usb_products_vals[] = {
     { 0x13d33304, "Asus Integrated Bluetooth module [AR3011]" },
     { 0x13d33306, "Mediao 802.11n WLAN [Realtek RTL8191SU]" },
     { 0x13d33315, "Bluetooth module" },
+    { 0x13d33362, "Atheros AR3012 Bluetooth 4.0 Adapter" },
     { 0x13d33375, "Atheros AR3012 Bluetooth 4.0 Adapter" },
     { 0x13d33392, "Azurewave 43228+20702" },
     { 0x13d33394, "Bluetooth" },
@@ -15995,14 +16025,18 @@ static const value_string usb_products_vals[] = {
     { 0x15180001, "HDReye High Dynamic Range Camera" },
     { 0x15180002, "HDReye (before firmware loads)" },
     { 0x15190020, "HSIC Device" },
+    { 0x15190443, "Telit LN930" },
     { 0x15246680, "UTS 6680" },
     { 0x15270200, "YAP Phone (no firmware)" },
     { 0x15270201, "YAP Phone" },
     { 0x15293100, "CDMA 1xRTT USB Modem (U-100/105/200/300/520)" },
+    { 0x152a8350, "NET Gmbh iCube Camera" },
     { 0x152a8400, "INI DVS128" },
     { 0x152a840d, "INI DAViS" },
     { 0x152a841a, "INI DAViS FX3" },
-    { 0x152d0539, "JMS539 SuperSpeed SATA II 3.0G Bridge" },
+    { 0x152b0003, "M.I.R. srl Minispir" },
+    { 0x152d0539, "JMS539/567 SuperSpeed SATA II/III 3.0G/6.0G Bridge" },
+    { 0x152d0567, "JMS567 SATA 6.0Gb/s bridge" },
     { 0x152d0770, "Alienware Integrated Webcam" },
     { 0x152d2329, "JM20329 SATA Bridge" },
     { 0x152d2335, "ATA/ATAPI Bridge" },
@@ -17651,8 +17685,29 @@ static const value_string usb_products_vals[] = {
     { 0x29310a02, "Jolla Phone Developer" },
     { 0x29310a05, "Jolla PC connection" },
     { 0x29310afe, "Jolla charging only" },
-    { 0x2a030001, "Linino One (CDC ACM)" },
-    { 0x2a038001, "Linino ONE board" },
+    { 0x2a030001, "Linino ONE (bootloader)" },
+    { 0x2a030036, "Arduino Leonardo (bootloader)" },
+    { 0x2a030037, "Arduino Micro (bootloader)" },
+    { 0x2a030038, "Arduino Robot Control (bootloader)" },
+    { 0x2a030039, "Arduino Robot Motor (bootloader)" },
+    { 0x2a03003a, "Arduino Micro ADK rev3 (bootloader)" },
+    { 0x2a03003b, "Arduino Serial" },
+    { 0x2a03003c, "Arduino Explora (bootloader)" },
+    { 0x2a03003d, "Arduino Due (usb2serial)" },
+    { 0x2a03003e, "Arduino Due" },
+    { 0x2a030041, "Arduino Yun (bootloader)" },
+    { 0x2a030042, "Arduino Mega 2560 Rev3" },
+    { 0x2a030043, "Arduino Uno Rev3" },
+    { 0x2a03004d, "Arduino Zero Pro (bootloader)" },
+    { 0x2a038001, "Linino ONE (CDC ACM)" },
+    { 0x2a038036, "Arduino Leonardo (CDC ACM)" },
+    { 0x2a038037, "Arduino Micro (CDC ACM)" },
+    { 0x2a038038, "Arduino Robot Control (CDC ACM)" },
+    { 0x2a038039, "Arduino Robot Motor (CDC ACM)" },
+    { 0x2a03803a, "Arduino Micro ADK rev3 (CDC ACM)" },
+    { 0x2a03803c, "Arduino Explora (CDC ACM)" },
+    { 0x2a038041, "Arduino Yun (CDC ACM)" },
+    { 0x2a03804d, "Arduino Zero Pro (CDC ACM)" },
     { 0x2c0214ea, "GW-US11H WLAN" },
     { 0x2c1a0000, "Wireless Optical Mouse" },
     { 0x31250001, "TrackerPod Camera Stand" },