[Automatic update for 2015-04-26]

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

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

1 files changed, 63 insertions, 13 deletions

diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 2eb0ffa383..cf25d246d9 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -196,7 +196,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x047d, "Kensington" },
     { 0x047e, "Agere Systems, Inc. (Lucent)" },
     { 0x047f, "Plantronics, Inc." },
-    { 0x0480, "Toshiba America Info. Systems, Inc." },
+    { 0x0480, "Toshiba America Inc" },
     { 0x0481, "Zenith Data Systems" },
     { 0x0482, "Kyocera Corp." },
     { 0x0483, "STMicroelectronics" },
@@ -1385,7 +1385,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x0b7b, "Taiko Denki Co., Ltd" },
     { 0x0b7c, "ITRAN Communications, Ltd" },
     { 0x0b7d, "Astrodesign, Inc." },
-    { 0x0b81, "id3 Semiconductors" },
+    { 0x0b81, "id3 Technologies" },
     { 0x0b84, "Rextron Technology, Inc." },
     { 0x0b85, "Elkat Electronics, Sdn., Bhd." },
     { 0x0b86, "Exputer Systems, Inc." },
@@ -2153,6 +2153,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x120f, "Magellan" },
     { 0x1210, "DigiTech" },
     { 0x121e, "Jungsoft Co., Ltd" },
+    { 0x1221, "Unknown manufacturer" },
     { 0x1223, "SKYCABLE ENTERPRISE. CO., LTD." },
     { 0x1228, "Datapaq Limited" },
     { 0x1230, "Chipidea-Microelectronica, S.A." },
@@ -2385,6 +2386,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x160a, "VIA Technologies, Inc." },
     { 0x160e, "INRO" },
     { 0x1614, "Amoi Electronics" },
+    { 0x1617, "Sony Corp." },
     { 0x1619, "L & K Precision Technology Co., Ltd." },
     { 0x1621, "Wionics Research" },
     { 0x1628, "Stonestreet One, Inc." },
@@ -2856,6 +2858,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x289b, "Dracal/Raphnet technologies" },
     { 0x2931, "Jolla Oy" },
     { 0x2a03, "dog hunter AG" },
+    { 0x2a37, "RTD Embedded Technologies, Inc." },
     { 0x2a45, "Meizu Corp." },
     { 0x2c02, "Planex Communications" },
     { 0x2c1a, "Dolphin Peripherals" },
@@ -3153,6 +3156,7 @@ static const value_string usb_products_vals[] = {
     { 0x03f00701, "ScanJet 5300c/5370c" },
     { 0x03f00704, "DeskJet 825c" },
     { 0x03f00705, "ScanJet 4400c" },
+    { 0x03f0070c, "Personal Media Drive" },
     { 0x03f00711, "OfficeJet K80" },
     { 0x03f00712, "DeskJet 1180c" },
     { 0x03f00714, "Printing Support" },
@@ -4455,6 +4459,7 @@ static const value_string usb_products_vals[] = {
     { 0x04210600, "Digital Pen SU-1B" },
     { 0x04210610, "CS-15 (Internet Stick 3G modem)" },
     { 0x04210661, "Lumia 920" },
+    { 0x04210720, "X (RM-980)" },
     { 0x04210800, "Connectivity Cable DKU-5" },
     { 0x04210801, "Data Cable DKU-6" },
     { 0x04210802, "CA-42 Phone Parent" },
@@ -5177,7 +5182,7 @@ static const value_string usb_products_vals[] = {
     { 0x04600004, "Tablet (5x3.75)" },
     { 0x04600006, "LCD Tablet (12x9)" },
     { 0x04600008, "Tablet (3x2.25)" },
-    { 0x04610010, "HP Keyboard" },
+    { 0x04610010, "HP PR1101U / Primax PMX-KPR1101U Keyboard" },
     { 0x04610300, "G2-300 Scanner" },
     { 0x04610301, "G2E-300 Scanner" },
     { 0x04610302, "G2-300 #2 Scanner" },
@@ -5401,7 +5406,7 @@ static const value_string usb_products_vals[] = {
     { 0x046db305, "BT Mini-Receiver" },
     { 0x046dbfe4, "Premium Optical Wheel Mouse" },
     { 0x046dc000, "N43 [Pilot Mouse]" },
-    { 0x046dc001, "N48/M-BB48 [FirstMouse Plus]" },
+    { 0x046dc001, "N48/M-BB48/M-UK96A [FirstMouse Plus]" },
     { 0x046dc002, "M-BA47 [MouseMan Plus]" },
     { 0x046dc003, "MouseMan" },
     { 0x046dc004, "WingMan Gaming Mouse" },
@@ -5885,6 +5890,7 @@ static const value_string usb_products_vals[] = {
     { 0x047f4254, "BUA-100 Bluetooth Adapter" },
     { 0x047fac01, "Savi 7xx" },
     { 0x047fad01, "GameCom 777 5.1 Headset" },
+    { 0x047fc008, "Audio 655 DSP" },
     { 0x047fc00e, "Blackwire C310 headset" },
     { 0x04800001, "InTouch Module" },
     { 0x04800004, "InTouch Module" },
@@ -7229,6 +7235,8 @@ static const value_string usb_products_vals[] = {
     { 0x04ca004f, "SK-9020 keyboard" },
     { 0x04ca1766, "HID Monitor Controls" },
     { 0x04ca2004, "Bluetooth 4.0 [Broadcom BCM20702A0]" },
+    { 0x04ca300b, "Atheros AR3012 Bluetooth" },
+    { 0x04ca300d, "Atheros AR3012 Bluetooth" },
     { 0x04ca7025, "HP HD Webcam" },
     { 0x04ca9304, "Hub" },
     { 0x04caf01c, "TT1280DA DVB-T TV Tuner" },
@@ -7634,6 +7642,7 @@ static const value_string usb_products_vals[] = {
     { 0x04e83296, "ML-2580N Mono Laser Printer" },
     { 0x04e83297, "ML-191x/ML-252x Laser Printer" },
     { 0x04e8329f, "CLP-325 Color Laser Printer" },
+    { 0x04e83301, "ML-1660 Series" },
     { 0x04e8330c, "ML-1865" },
     { 0x04e83310, "ML-331x Series Laser Printer" },
     { 0x04e83315, "ML-2540 Series Laser Printer" },
@@ -7797,7 +7806,7 @@ static const value_string usb_products_vals[] = {
     { 0x04e8685c, "GT-I9250 Phone [Galaxy Nexus] (Mass storage mode)" },
     { 0x04e8685d, "GT-I9100 Phone [Galaxy S II] (Download mode)" },
     { 0x04e8685e, "Samsung Galaxy Y" },
-    { 0x04e86860, "GT-I9100 Phone [Galaxy S II], GT-I9300 Phone [Galaxy S III], GT-P7500 [Galaxy Tab 10.1] , GT-I9500 [Galaxy S 4]" },
+    { 0x04e86860, "Galaxy (MTP)" },
     { 0x04e86863, "GT-I9500 [Galaxy S4] / GT-I9250 [Galaxy Nexus] (network tethering)" },
     { 0x04e86864, "GT-I9070 (network tethering, USB debugging enabled)" },
     { 0x04e86865, "GT-I9300 Phone [Galaxy S III] (PTP mode)" },
@@ -7918,6 +7927,7 @@ static const value_string usb_products_vals[] = {
     { 0x04f2b330, "Asus 720p CMOS webcam" },
     { 0x04f2b354, "UVC 1.00 device HD UVC WebCam" },
     { 0x04f2b394, "Integrated Camera" },
+    { 0x04f2b3f6, "HD WebCam (Acer)" },
     { 0x04f3000a, "Touchscreen" },
     { 0x04f30103, "ActiveJet K-2024 Multimedia Keyboard" },
     { 0x04f301a4, "Wireless Keyboard" },
@@ -9421,6 +9431,7 @@ static const value_string usb_products_vals[] = {
     { 0x059f0829, "BigDisk Extreme+" },
     { 0x059f100c, "Rugged Triple Interface Mobile Hard Drive" },
     { 0x059f1010, "Desktop Hard Drive" },
+    { 0x059f1018, "Desktop Hard Drive" },
     { 0x059f1019, "Desktop Hard Drive" },
     { 0x059f1021, "Little Disk" },
     { 0x059f1027, "iamaKey V2" },
@@ -9603,10 +9614,10 @@ static const value_string usb_products_vals[] = {
     { 0x05ac12a4, "iPad 3 (wifi)" },
     { 0x05ac12a5, "iPad 3 (CDMA)" },
     { 0x05ac12a6, "iPad 3 (3G, 16 GB)" },
-    { 0x05ac12a8, "iPhone5/5C/5S" },
+    { 0x05ac12a8, "iPhone5/5C/5S/6" },
     { 0x05ac12a9, "iPad 2" },
     { 0x05ac12aa, "iPod Touch 5.Gen [A1421]" },
-    { 0x05ac12ab, "iPad 4 (WiFi, 32GB)" },
+    { 0x05ac12ab, "iPad 4/Mini1" },
     { 0x05ac1300, "iPod Shuffle" },
     { 0x05ac1301, "iPod Shuffle 2.Gen" },
     { 0x05ac1302, "iPod Shuffle 3.Gen" },
@@ -10069,6 +10080,7 @@ static const value_string usb_products_vals[] = {
     { 0x05e30736, "microSD Reader/Writer" },
     { 0x05e30741, "microSD Card Reader" },
     { 0x05e30743, "SDXC and microSDXC CardReader" },
+    { 0x05e30745, "Logilink CR0012" },
     { 0x05e30760, "USB 2.0 Card Reader/Writer" },
     { 0x05e30761, "Genesys Mass Storage Device" },
     { 0x05e30780, "USBFS DFU Adapter" },
@@ -11181,6 +11193,7 @@ static const value_string usb_products_vals[] = {
     { 0x076b1221, "CardMan 1221" },
     { 0x076b1784, "CardMan 6020" },
     { 0x076b3021, "CardMan 3121" },
+    { 0x076b3022, "CardMan 3021" },
     { 0x076b3610, "CardMan 3620" },
     { 0x076b3621, "CardMan 3621" },
     { 0x076b3821, "CardMan 3821" },
@@ -11465,7 +11478,7 @@ static const value_string usb_products_vals[] = {
     { 0x07b30c0c, "PL806 Scanner" },
     { 0x07b30c26, "OpticBook 4600 Scanner" },
     { 0x07b30c2b, "Mobile Office D428 Scanner" },
-    { 0x07b30e08, "Plustek OpticBook A300 Scanner" },
+    { 0x07b30e08, "OpticBook A300 Scanner" },
     { 0x07b31300, "OpticBook 3800 Scanner" },
     { 0x07b31301, "OpticBook 4800 Scanner" },
     { 0x07b40100, "Camedia C-2100/C-3000 Ultra Zoom Camera" },
@@ -12422,6 +12435,7 @@ static const value_string usb_products_vals[] = {
     { 0x0930001a, "Toshiba Gigabeat MEU201" },
     { 0x0930001d, "Toshiba Gigabeat MET401" },
     { 0x09300200, "Integrated Bluetooth (Taiyo Yuden)" },
+    { 0x0930021c, "Atheros AR3012 Bluetooth" },
     { 0x09300301, "PCX1100U Cable Modem (WDM)" },
     { 0x09300302, "PCX2000 Cable Modem (WDM)" },
     { 0x09300305, "Cable Modem PCX3000" },
@@ -12709,6 +12723,7 @@ static const value_string usb_products_vals[] = {
     { 0x09f50188, "LAN Adapter" },
     { 0x09f50850, "Adapter" },
     { 0x09fb6001, "Blaster" },
+    { 0x0a050001, "Hub" },
     { 0x0a057211, "hub" },
     { 0x0a070064, "ADU100 Data Acquisition Interface" },
     { 0x0a070078, "ADU120 Data Acquisition Interface" },
@@ -12863,6 +12878,7 @@ static const value_string usb_products_vals[] = {
     { 0x0a5c2150, "BCM2046 Bluetooth Device" },
     { 0x0a5c2151, "Bluetooth" },
     { 0x0a5c2154, "BCM92046DG-CL1ROM Bluetooth 2.1 UHE Dongle" },
+    { 0x0a5c216c, "BCM43142A0 Bluetooth Device" },
     { 0x0a5c217d, "HP Bluethunder" },
     { 0x0a5c217f, "BCM2045B (BDC-2.1)" },
     { 0x0a5c2198, "Bluetooth 3.0 Device" },
@@ -13139,6 +13155,7 @@ static const value_string usb_products_vals[] = {
     { 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]" },
+    { 0x0b0517cb, "Broadcom BCM20702A0 Bluetooth" },
     { 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)" },
@@ -13483,6 +13500,7 @@ 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]" },
+    { 0x0bb40f25, "One M8" },
     { 0x0bb40f64, "Desire 601" },
     { 0x0bb40ff8, "Desire HD (Tethering Mode)" },
     { 0x0bb40ff9, "Desire / Desire HD / Hero / Thunderbolt (Charge Mode)" },
@@ -14717,6 +14735,7 @@ static const value_string usb_products_vals[] = {
     { 0x0fce0181, "SONY SO-05D Xperia SX MTP" },
     { 0x0fce0182, "SONY LT30p Xperia T MTP" },
     { 0x0fce0186, "SONY LT25i Xperia V MTP" },
+    { 0x0fce01bb, "D5803 [Xperia Z3 Compact] (MTP mode)" },
     { 0x0fce0dde, "Xperia Mini Pro Bootloader" },
     { 0x0fce1010, "WMC Modem" },
     { 0x0fce10af, "V640i Phone [PictBridge]" },
@@ -15399,12 +15418,35 @@ static const value_string usb_products_vals[] = {
     { 0x12091003, "IBSecureCam-P" },
     { 0x12091004, "IBSecureCam-O" },
     { 0x12091005, "IBSecureCam-N" },
+    { 0x12091006, "Mini IO-Board" },
+    { 0x12092000, "Zygmunt Krynicki Lantern Brightness Sensor" },
+    { 0x12092048, "Housedillon.com MRF49XA Transciever" },
+    { 0x12092222, "LabConnect Signalgenerator" },
+    { 0x12092300, "Keyboardio Keyboardio Model 01 Bootloader" },
+    { 0x12092301, "Keyboardio Keyboardio Model 01" },
+    { 0x12092337, "/Dev or SlashDev /Net" },
+    { 0x12093000, "lloyd3000" },
+    { 0x12093333, "LabConnect Digitalnetzteil" },
+    { 0x12095222, "telavivmakers attami" },
+    { 0x12095a22, "ikari_01 sd2snes" },
+    { 0x12097bd0, "pokey9000 Tiny Bit Dingus" },
+    { 0x1209abd0, "tibounise ADB converter" },
+    { 0x1209beef, "Modal MC-USB" },
+    { 0x1209c0f5, "unethi PERswitch" },
+    { 0x1209ca1c, "KnightOS Hub" },
+    { 0x1209ca1d, "KnightOS MTP Device" },
+    { 0x1209cafe, "ii iigadget" },
+    { 0x1209dada, "Rebel Technology OWL" },
+    { 0x1209dead, "chaosfield.at AVR-Ruler" },
+    { 0x1209fa11, "moonglow OpenXHC" },
+    { 0x1209feed, "ProgramGyar AVR-IR Sender" },
     { 0x120f524e, "RoadMate 1475T" },
     { 0x120f5260, "Triton Handheld GPS Receiver (300/400/500/1500/2000)" },
     { 0x12100016, "RP500 Guitar Multi-Effects Processor" },
     { 0x1210001b, "RP155 Guitar Multi-Effects Processor" },
     { 0x1210001c, "RP255 Guitar Multi-Effects Processor" },
     { 0x121e3403, "Muzio JM250 Audio Player" },
+    { 0x12213234, "Disk (Thumb drive)" },
     { 0x12280012, "Q18 Data Logger" },
     { 0x12280015, "TPaq21/MPaq21 Datalogger" },
     { 0x1228584c, "XL2 Logger" },
@@ -15554,8 +15596,8 @@ static const value_string usb_products_vals[] = {
     { 0x12d1140b, "EC1260 Wireless Data Modem HSD USB Card" },
     { 0x12d1140c, "E180v" },
     { 0x12d11412, "EC168c" },
-    { 0x12d11436, "E173 3G Modem (modem-mode)" },
-    { 0x12d11446, "E1552/E1800/E173 (HSPA modem)" },
+    { 0x12d11436, "Broadband stick" },
+    { 0x12d11446, "Broadband stick (modem on)" },
     { 0x12d11465, "K3765 HSPA" },
     { 0x12d114c3, "K5005 Vodafone LTE/UMTS/GSM Modem/Networkcard" },
     { 0x12d114c8, "K5005 Vodafone LTE/UMTS/GSM MOdem/Networkcard" },
@@ -15575,7 +15617,7 @@ static const value_string usb_products_vals[] = {
     { 0x12d11575, "K5150 LTE modem" },
     { 0x12d115ca, "E3131 3G/UMTS/HSPA+ Modem (Mass Storage Mode)" },
     { 0x12d11805, "AT&T Go Phone U2800A phone" },
-    { 0x12d11c05, "E173s 3G broadband stick (modem on)" },
+    { 0x12d11c05, "Broadband stick (modem on)" },
     { 0x12d11c0b, "E173s 3G broadband stick (modem off)" },
     { 0x12d11c20, "R205 Mobile WiFi (Charging)" },
     { 0x12d11d50, "ET302s TD-SCDMA/TD-HSDPA Mobile Broadband" },
@@ -16310,6 +16352,7 @@ static const value_string usb_products_vals[] = {
     { 0x16140404, "WMA9109 UMTS Phone" },
     { 0x16140600, "Vodafone VDA GPS / Toschiba Protege G710" },
     { 0x16140804, "WP-S1 Phone" },
+    { 0x16172002, "NVX-P1 Personal Navigation System" },
     { 0x16300005, "802.11g Wireless Adapter [Intersil ISL3886]" },
     { 0x16300011, "PC Port 10 Mps Adapter" },
     { 0x1630ff81, "802.11b Wireless Adapter [Lucent/Agere Hermes I]" },
@@ -16462,6 +16505,8 @@ static const value_string usb_products_vals[] = {
     { 0x16c005e4, "Free shared USB VID/PID pair for MIDI devices" },
     { 0x16c006b4, "USB2LPT with 2 interfaces" },
     { 0x16c006b5, "USB2LPT with 3 interfaces (native, HID, printer)" },
+    { 0x16c0074e, "DSP-Weuffen USB-HPI-Programmer" },
+    { 0x16c0074f, "DSP-Weuffen USB2-HPI-Programmer" },
     { 0x16c00762, "Osmocom SIMtrace" },
     { 0x16c0076b, "OpenPCD 13.56MHz RFID Reader" },
     { 0x16c0076c, "OpenPICC 13.56MHz RFID Simulator (native)" },
@@ -16520,6 +16565,7 @@ static const value_string usb_products_vals[] = {
     { 0x17030001, "NormSoft, Inc. Pocket Tunes" },
     { 0x17030002, "NormSoft, Inc. Pocket Tunes 4" },
     { 0x170b0011, "MIDI-USB 1x1" },
+    { 0x17110101, "DFC-365FX camera" },
     { 0x17113020, "IC80 HD Camera" },
     { 0x17240115, "PAXcam5" },
     { 0x17261000, "wireless modem" },
@@ -16561,9 +16607,12 @@ static const value_string usb_products_vals[] = {
     { 0x17409706, "EUB9706 802.11n Wireless Adapter [Ralink RT3072]" },
     { 0x17409801, "EUB9801 802.11abgn Wireless Adapter [Ralink RT3572]" },
     { 0x17480101, "Packet-Master USB12" },
-    { 0x174c5106, "Transcend StoreJet 25M3" },
+    { 0x174c1153, "ASM2115 SATA 6Gb/s bridge" },
+    { 0x174c2074, "ASM1074 High-Speed hub" },
+    { 0x174c3074, "ASM1074 SuperSpeed hub" },
+    { 0x174c5106, "ASM1051 SATA 3Gb/s bridge" },
     { 0x174c5136, "ASM1053 SATA 6Gb/s bridge" },
-    { 0x174c55aa, "ASM1051 SATA 3Gb/s bridge" },
+    { 0x174c55aa, "ASM1051E SATA 6Gb/s bridge, ASM1053E SATA 6Gb/s bridge, ASM1153 SATA 3Gb/s bridge" },
     { 0x174f1105, "SM-MS/Pro-MMC-XD Card Reader" },
     { 0x174f110b, "HP Webcam" },
     { 0x174f1403, "Integrated Webcam" },
@@ -17781,6 +17830,7 @@ static const value_string usb_products_vals[] = {
     { 0x2a03803c, "Arduino Explora (CDC ACM)" },
     { 0x2a038041, "Arduino Yun (CDC ACM)" },
     { 0x2a03804d, "Arduino Zero Pro (CDC ACM)" },
+    { 0x2a375110, "UPS35110/UPS25110" },
     { 0x2a450001, "MX Phone (BICR)" },
     { 0x2a450c02, "MX Phone (MTP & ADB)" },
     { 0x2a450c03, "MX Phone (BICR & ADB)" },