[Automatic update for 2015-04-05]

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

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

1 files changed, 56 insertions, 7 deletions

diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index cdd70f9075..2eb0ffa383 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -2331,7 +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" },
+    { 0x152b, "MIR Srl" },
     { 0x152d, "JMicron Technology Corp. / JMicron USA Technology Corp." },
     { 0x152e, "LG (HLDS)" },
     { 0x1532, "Razer USA, Ltd" },
@@ -2392,7 +2392,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x162f, "WiQuest Communications, Inc." },
     { 0x1630, "2Wire, Inc." },
     { 0x1631, "Good Way Technology" },
-    { 0x1645, "Cross Match Technologies GmbH" },
+    { 0x1645, "Entrega [hex]" },
     { 0x1649, "SofTec Microsystems" },
     { 0x164a, "ChipX" },
     { 0x164c, "Matrix Vision GmbH" },
@@ -2400,6 +2400,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x165b, "Frontier Design Group" },
     { 0x165c, "Kondo Kagaku" },
     { 0x1660, "Creatix Polymedia GmbH" },
+    { 0x1667, "GIGA-TMS INC." },
     { 0x1668, "Actiontec Electronics, Inc. [hex]" },
     { 0x1669, "PiKRON Ltd. [hex]" },
     { 0x166a, "Clipsal" },
@@ -2855,6 +2856,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x289b, "Dracal/Raphnet technologies" },
     { 0x2931, "Jolla Oy" },
     { 0x2a03, "dog hunter AG" },
+    { 0x2a45, "Meizu Corp." },
     { 0x2c02, "Planex Communications" },
     { 0x2c1a, "Dolphin Peripherals" },
     { 0x2fb2, "Fujitsu, Ltd" },
@@ -5895,6 +5897,7 @@ static const value_string usb_products_vals[] = {
     { 0x0480a009, "Stor.E Basics" },
     { 0x0480a00d, "STOR.E BASICS 500GB" },
     { 0x0480b001, "Stor.E Partner" },
+    { 0x0480d000, "External Disk 2TB Model DT01ABA200" },
     { 0x0480d010, "External Disk 3TB" },
     { 0x0480d011, "Canvio Desk" },
     { 0x0482000e, "FS-1020D Printer" },
@@ -5944,7 +5947,9 @@ static const value_string usb_products_vals[] = {
     { 0x0489e00f, "Foxconn T77H114 BCM2070 [Single-Chip Bluetooth 2.1 + EDR Adapter]" },
     { 0x0489e016, "Ubee PXU1900 WiMAX Adapter [Beceem BCSM250]" },
     { 0x0489e02c, "Atheros AR5BBU12 Bluetooth Device" },
+    { 0x0489e032, "Broadcom BCM20702 Bluetooth" },
     { 0x0489e040, "Vizio VTAB1008" },
+    { 0x0489e042, "Broadcom BCM20702 Bluetooth" },
     { 0x0489e04d, "Atheros AR3012 Bluetooth" },
     { 0x048d1165, "IT1165 Flash Controller" },
     { 0x048d1336, "SD/MMC Cardreader" },
@@ -7105,7 +7110,7 @@ static const value_string usb_products_vals[] = {
     { 0x04b80881, "PX-404A [ME OFFICE 535]" },
     { 0x04b80883, "ME 340 Series/Stylus NX130 Series" },
     { 0x04b80884, "Stylus NX430W Series" },
-    { 0x04b80885, "Stylus NX230 Series" },
+    { 0x04b80885, "Stylus NX230/SX235W Series" },
     { 0x04b8088f, "Stylus Office BX635FWD" },
     { 0x04b80890, "ME OFFICE 940FW Series/Stylus Office BX630FW Series" },
     { 0x04b80891, "Stylus Office BX535WD" },
@@ -8042,7 +8047,7 @@ static const value_string usb_products_vals[] = {
     { 0x04f9017b, "Imagistics sx2100" },
     { 0x04f90180, "MFC-7420" },
     { 0x04f90181, "MFC-7820N Port(FaxModem)" },
-    { 0x04f90182, "Composite Device" },
+    { 0x04f90182, "DCP-7010" },
     { 0x04f90183, "DCP-7020" },
     { 0x04f90184, "DCP-7025 Printer" },
     { 0x04f90185, "MFC-7220 Printer" },
@@ -13571,6 +13576,7 @@ static const value_string usb_products_vals[] = {
     { 0x0bda2831, "RTL2831U DVB-T" },
     { 0x0bda2832, "RTL2832U DVB-T" },
     { 0x0bda2838, "RTL2838 DVB-T" },
+    { 0x0bda5401, "RTL 8153 USB 3.0 hub with gigabit ethernet" },
     { 0x0bda5730, "HP 2.0MP High Definition Webcam" },
     { 0x0bda5775, "HP \"Truevision HD\" laptop camera" },
     { 0x0bda8150, "RTL8150 Fast Ethernet Adapter" },
@@ -14720,6 +14726,7 @@ static const value_string usb_products_vals[] = {
     { 0x0fce2137, "Xperia X10 mini (USB debug)" },
     { 0x0fce2138, "Xperia X10 mini pro (Debug)" },
     { 0x0fce2149, "Xperia X8 (debug)" },
+    { 0x0fce214e, "J108i Cedar (Windows-driver mode)" },
     { 0x0fce3137, "Xperia X10 mini" },
     { 0x0fce3138, "Xperia X10 mini pro" },
     { 0x0fce3149, "Xperia X8" },
@@ -14800,7 +14807,7 @@ static const value_string usb_products_vals[] = {
     { 0x0fced12a, "U100i Yari Phone" },
     { 0x0fced12e, "Xperia X10" },
     { 0x0fced144, "SonyEricsson j10i (Elm)" },
-    { 0x0fced14e, "J108i Cedar" },
+    { 0x0fced14e, "J108i Cedar (modem mode)" },
     { 0x0fcee000, "SonyEricsson K550i" },
     { 0x0fcee039, "K800i (msc mode)" },
     { 0x0fcee042, "W810i Phone" },
@@ -14819,6 +14826,7 @@ static const value_string usb_products_vals[] = {
     { 0x0fcee112, "W995 Phone (Mass Storage)" },
     { 0x0fcee12e, "X10i Phone" },
     { 0x0fcee133, "Vivaz" },
+    { 0x0fcee14e, "J108i Cedar (mass-storage mode)" },
     { 0x0fcee14f, "Xperia Arc/X12" },
     { 0x0fcee15a, "Xperia Pro [Mass Storage Class]" },
     { 0x0fcee161, "Xperia Ray" },
@@ -15114,6 +15122,7 @@ static const value_string usb_products_vals[] = {
     { 0x106f000c, "Xchange" },
     { 0x10760031, "Bluetooth Device" },
     { 0x10760032, "Bluetooth Device" },
+    { 0x10768002, "LU150 LTE Modem [Yota LU150]" },
     { 0x107b3009, "eHome Infrared Transceiver" },
     { 0x107b55b2, "WBU-110 802.11b Wireless Adapter [Intersil PRISM 3]" },
     { 0x107b55f2, "WGU-210 802.11g Adapter [Intersil ISL3886]" },
@@ -15803,6 +15812,7 @@ static const value_string usb_products_vals[] = {
     { 0x13d33375, "Atheros AR3012 Bluetooth 4.0 Adapter" },
     { 0x13d33392, "Azurewave 43228+20702" },
     { 0x13d33394, "Bluetooth" },
+    { 0x13d33474, "Atheros AR3012 Bluetooth" },
     { 0x13d35070, "Webcam" },
     { 0x13d35111, "Integrated Webcam" },
     { 0x13d35115, "Integrated Webcam" },
@@ -16036,7 +16046,27 @@ static const value_string usb_products_vals[] = {
     { 0x152a8400, "INI DVS128" },
     { 0x152a840d, "INI DAViS" },
     { 0x152a841a, "INI DAViS FX3" },
-    { 0x152b0003, "M.I.R. srl Minispir" },
+    { 0x152b0001, "spirobank II" },
+    { 0x152b0002, "spirolab III" },
+    { 0x152b0003, "MiniSpir" },
+    { 0x152b0004, "Oxi" },
+    { 0x152b0005, "spiros II" },
+    { 0x152b0006, "smiths spirobank II" },
+    { 0x152b0007, "smiths spirobank G-USB" },
+    { 0x152b0008, "smiths MiniSpir" },
+    { 0x152b0009, "spirobank G-USB" },
+    { 0x152b000a, "smiths Oxi" },
+    { 0x152b000b, "smiths spirolab III" },
+    { 0x152b000c, "chorus III" },
+    { 0x152b000d, "spirolab III Bw" },
+    { 0x152b000e, "spirolab III" },
+    { 0x152b000f, "easySpiro" },
+    { 0x152b0010, "Spirotel converter" },
+    { 0x152b0011, "spirobank" },
+    { 0x152b0012, "spiro3 Zimmer" },
+    { 0x152b0013, "spirotel serial" },
+    { 0x152b0014, "spirotel II" },
+    { 0x152b0015, "spirodoc" },
     { 0x152d0539, "JMS539/567 SuperSpeed SATA II/III 3.0G/6.0G Bridge" },
     { 0x152d0567, "JMS567 SATA 6.0Gb/s bridge" },
     { 0x152d0770, "Alienware Integrated Webcam" },
@@ -16048,6 +16078,10 @@ static const value_string usb_products_vals[] = {
     { 0x152d2339, "JM20339 SATA Bridge" },
     { 0x152d2352, "ATA/ATAPI Bridge" },
     { 0x152d2509, "JMS539 SuperSpeed SATA II 3.0G Bridge" },
+    { 0x152d2551, "JMS551 SATA 3Gb/s bridge" },
+    { 0x152d2566, "JMS566 SATA 3Gb/s bridge" },
+    { 0x152d3562, "JMS567 SATA 6.0Gb/s bridge" },
+    { 0x152d3569, "ATA/ATAPI Bridge [AdPlus SuperVer]" },
     { 0x152e2507, "PL-2507 IDE Controller" },
     { 0x152ee001, "GSA-5120D DVD-RW" },
     { 0x15320001, "RZ01-020300 Optical Mouse [Diamondback]" },
@@ -16068,14 +16102,19 @@ static const value_string usb_products_vals[] = {
     { 0x15320300, "RZ06-0063 Motion Sensing Controllers [Hydra]" },
     { 0x153b1181, "Cinergy S2 PCIe Dual Port 1" },
     { 0x153b1182, "Cinergy S2 PCIe Dual Port 2" },
+    { 0x154601a5, "NL-402U" },
     { 0x15471000, "SG-Lock[U2]" },
     { 0x154a8180, "CARD STAR/medic2" },
     { 0x154b0010, "USB 2.0 Flash Drive" },
     { 0x154b0048, "Flash Drive" },
     { 0x154b004d, "8 GB Flash Drive" },
+    { 0x154b0053, "Flash Drive" },
     { 0x154b0057, "32GB Micro Slide Attache Flash Drive" },
-    { 0x154b007a, "8GB Classic Attache Flash Drive" },
+    { 0x154b005b, "Flash Drive" },
+    { 0x154b0062, "Flash Drive" },
+    { 0x154b007a, "Classic Attache Flash Drive" },
     { 0x154b6545, "FD Device" },
+    { 0x154bfa05, "Flash Drive" },
     { 0x154e3000, "Marantz RC9001 Remote Control" },
     { 0x15545010, "PV-D231U(RN)-F [PixelView PlayTV SBTVD Full-Seg]" },
     { 0x15570002, "model 01 WiFi interface" },
@@ -16116,6 +16155,7 @@ static const value_string usb_products_vals[] = {
     { 0x15a90006, "Wireless 11n USB Adapter" },
     { 0x15a90010, "802.11n USB Wireless Card" },
     { 0x15a90012, "WUBR-208N 802.11abgn Wireless Adapter [Ralink RT2870]" },
+    { 0x15a9002d, "WLTUBA-107 [Yota 4G LTE]" },
     { 0x15ba0003, "OpenOCD JTAG" },
     { 0x15ba0004, "OpenOCD JTAG TINY" },
     { 0x15ba002a, "ARM-USB-TINY-H JTAG interface" },
@@ -16306,6 +16346,7 @@ static const value_string usb_products_vals[] = {
     { 0x165b8101, "Tranzport Control Surface" },
     { 0x165bfad1, "Alphatrack Control Surface" },
     { 0x165c0002, "Serial Adapter" },
+    { 0x16670005, "PCR330A RFID Reader (125 kHz, keyboard emulation)" },
     { 0x16680009, "Gateway" },
     { 0x16680333, "Modem" },
     { 0x16680358, "InternetPhoneWizard" },
@@ -17740,6 +17781,14 @@ static const value_string usb_products_vals[] = {
     { 0x2a03803c, "Arduino Explora (CDC ACM)" },
     { 0x2a038041, "Arduino Yun (CDC ACM)" },
     { 0x2a03804d, "Arduino Zero Pro (CDC ACM)" },
+    { 0x2a450001, "MX Phone (BICR)" },
+    { 0x2a450c02, "MX Phone (MTP & ADB)" },
+    { 0x2a450c03, "MX Phone (BICR & ADB)" },
+    { 0x2a452008, "MX Phone (MTP)" },
+    { 0x2a45200a, "MX Phone (MTP & ACM & ADB)" },
+    { 0x2a45200b, "MX Phone (PTP)" },
+    { 0x2a45200c, "MX Phone (PTP & ADB)" },
+    { 0x2a452012, "MX Phone (MTP & ACM)" },
     { 0x2c0214ea, "GW-US11H WLAN" },
     { 0x2c1a0000, "Wireless Optical Mouse" },
     { 0x31250001, "TrackerPod Camera Stand" },