[Automatic manuf, services and enterprise-numbers update for 2014-06-29]

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

1 files changed, 35 insertions, 6 deletions

diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 76ac7000c7..2ea063e120 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -1168,7 +1168,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x09d3, "Com One" },
     { 0x09d7, "Novatel Wireless" },
     { 0x09d9, "KRF Tech, Ltd" },
-    { 0x09da, "A4 Tech Co., Ltd" },
+    { 0x09da, "A4Tech Co., Ltd." },
     { 0x09db, "Measurement Computing Corp." },
     { 0x09dc, "Aimex Corp." },
     { 0x09dd, "Fellowes, Inc." },
@@ -2828,6 +2828,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x2632, "TwinMOS" },
     { 0x2650, "Electronics For Imaging, Inc. [hex]" },
     { 0x2659, "Sundtek" },
+    { 0x2676, "Basler AG" },
     { 0x2730, "Citizen" },
     { 0x2735, "DigitalWay" },
     { 0x2770, "NHJ, Ltd" },
@@ -2997,7 +2998,10 @@ static const value_string usb_products_vals[] = {
     { 0x03eb2141, "ICE debugger" },
     { 0x03eb2310, "EVK11xx evaluation board" },
     { 0x03eb2fe4, "ATxmega32A4U DFU bootloader" },
+    { 0x03eb2fe6, "Cactus V6 (DFU)" },
+    { 0x03eb2fea, "Cactus RF60 (DFU)" },
     { 0x03eb2ff0, "atmega32u2 DFU bootloader" },
+    { 0x03eb2ff4, "atmega32u4 DFU bootloader" },
     { 0x03eb2ffa, "at90usb162 DFU bootloader" },
     { 0x03eb2ffb, "at90usb AVR DFU bootloader" },
     { 0x03eb2ffd, "at89c5130/c5131 DFU bootloader" },
@@ -4408,6 +4412,7 @@ static const value_string usb_products_vals[] = {
     { 0x04242524, "USB MultiSwitch Hub" },
     { 0x04242602, "USB 2.0 Hub" },
     { 0x04242640, "USB 2.0 Hub" },
+    { 0x04242660, "Hub" },
     { 0x04244060, "Ultra Fast Media Reader" },
     { 0x04244064, "Ultra Fast Media Reader" },
     { 0x04247500, "LAN7500 Ethernet 10/100/1000 Adapter" },
@@ -4686,7 +4691,7 @@ static const value_string usb_products_vals[] = {
     { 0x04570150, "Super Talent 1GB Flash Drive" },
     { 0x04570151, "Super Flash 1GB / GXT  64MB Flash Drive" },
     { 0x04570162, "SiS162 usb Wireless LAN Adapter" },
-    { 0x04570163, "802.11 Wireless LAN Adapter" },
+    { 0x04570163, "SiS163U 802.11 Wireless LAN Adapter" },
     { 0x04570817, "SiS-184-ASUS-4352.17 touch panel" },
     { 0x04575401, "Wireless Adapter RO80211GS-USB" },
     { 0x04580001, "Mouse" },
@@ -5196,6 +5201,7 @@ static const value_string usb_products_vals[] = {
     { 0x046d0828, "HD Webcam B990" },
     { 0x046d082d, "HD Pro Webcam C920" },
     { 0x046d0830, "QuickClip" },
+    { 0x046d0837, "BCC950 ConferenceCam" },
     { 0x046d0840, "QuickCam Express" },
     { 0x046d0843, "Webcam C930e" },
     { 0x046d0850, "QuickCam Web" },
@@ -5499,6 +5505,7 @@ static const value_string usb_products_vals[] = {
     { 0x046dc52e, "MK260 Wireless Combo Receiver" },
     { 0x046dc52f, "Unifying Receiver" },
     { 0x046dc532, "Unifying Receiver" },
+    { 0x046dc534, "Unifying Receiver" },
     { 0x046dc603, "3Dconnexion Spacemouse Plus XT" },
     { 0x046dc605, "3Dconnexion CADman" },
     { 0x046dc606, "3Dconnexion Spacemouse Classic" },
@@ -5793,6 +5800,7 @@ static const value_string usb_products_vals[] = {
     { 0x0480a006, "External Disk 1.5TB" },
     { 0x0480a007, "External Disk USB 3.0" },
     { 0x0480a009, "Stor.E Basics" },
+    { 0x0480a00d, "STOR.E BASICS 500GB" },
     { 0x0480d010, "External Disk 3TB" },
     { 0x0482000e, "FS-1020D Printer" },
     { 0x0482000f, "FS-1920 Mono Printer" },
@@ -6599,6 +6607,9 @@ static const value_string usb_products_vals[] = {
     { 0x04a93276, "PowerShot SX170 IS" },
     { 0x04a93277, "PowerShot SX510 HS" },
     { 0x04a9327d, "Powershot ELPH 115 IS / IXUS 132" },
+    { 0x04a9327f, "EOS Rebel T5 / EOS 1200D / EOS Kiss X70" },
+    { 0x04a93284, "PowerShot D30" },
+    { 0x04a93286, "PowerShot SX600 HS" },
     { 0x04a93288, "Powershot ELPH 135 / IXUS 145" },
     { 0x04a93289, "PowerShot ELPH 340 HS / IXUS 265 HS" },
     { 0x04a9328a, "PowerShot ELPH 150 IS / IXUS 155" },
@@ -7249,6 +7260,7 @@ static const value_string usb_products_vals[] = {
     { 0x04d80033, "PICkit2" },
     { 0x04d80036, "PICkit Serial Analyzer" },
     { 0x04d800e0, "PIC32 Starter Board" },
+    { 0x04d804cd, "28Cxxx EEPROM Programmer" },
     { 0x04d80a04, "AGP LIN Serial Analyzer" },
     { 0x04d88000, "In-Circuit Debugger" },
     { 0x04d88001, "ICD2 in-circuit debugger" },
@@ -7608,9 +7620,11 @@ static const value_string usb_products_vals[] = {
     { 0x04e85f04, "NEXiO Sync" },
     { 0x04e85f05, "STORY Station 1TB" },
     { 0x04e86032, "G2 Portable hard drive" },
+    { 0x04e86033, "G2 Portable device" },
     { 0x04e86034, "G2 Portable hard drive" },
     { 0x04e860b3, "M2 Portable Hard Drive" },
     { 0x04e860c4, "M2 Portable Hard Drive USB 3.0" },
+    { 0x04e86124, "D3 Station External Hard Drive" },
     { 0x04e861b6, "M3 Portable Hard Drive 1TB" },
     { 0x04e86601, "Mobile Phone" },
     { 0x04e86602, "Galaxy" },
@@ -7979,6 +7993,7 @@ static const value_string usb_products_vals[] = {
     { 0x04f90217, "MFC-8480DN" },
     { 0x04f90223, "DCP-365CN" },
     { 0x04f90248, "DCP-7055 scanner/printer" },
+    { 0x04f902b3, "MFC J4510DW" },
     { 0x04f91000, "Printer" },
     { 0x04f91002, "Printer" },
     { 0x04f92002, "PTUSB Printing" },
@@ -8074,7 +8089,7 @@ static const value_string usb_products_vals[] = {
     { 0x050d0004, "Direct Connect" },
     { 0x050d0012, "F8T012 Bluetooth Adapter" },
     { 0x050d0013, "F8T013 Bluetooth Adapter" },
-    { 0x050d0017, "B8T017 Bluetooth+EDR 2.1" },
+    { 0x050d0017, "B8T017 Bluetooth+EDR 2.1 / F4U017 USB 2.0 7-port Hub" },
     { 0x050d003a, "Universal Media Reader" },
     { 0x050d0050, "F5D6050 802.11b Wireless Adapter v2000 [Atmel at76c503a]" },
     { 0x050d0081, "F8T001v2 Bluetooth" },
@@ -8120,6 +8135,7 @@ static const value_string usb_products_vals[] = {
     { 0x050d1103, "F9L1103 N750 DB 802.11abgn 2x3:3 [Ralink RT3573]" },
     { 0x050d1106, "F9L1106v1 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]" },
     { 0x050d1109, "F9L1109v1 802.11a/b/g/n/ac Wireless Adapter [Realtek RTL8812AU]" },
+    { 0x050d110a, "F9L1101v2 802.11abgn Wireless Adapter [Realtek RTL8192DU]" },
     { 0x050d11f2, "ISY Wireless Micro Adapter IWL 2000 [RTL8188CUS]" },
     { 0x050d1202, "F5U120-PC Parallel Printer Port" },
     { 0x050d1203, "F5U120-PC Serial Port" },
@@ -8133,7 +8149,7 @@ static const value_string usb_products_vals[] = {
     { 0x050d5055, "F5D5055 Gigabit Network Adapter [AX88xxx]" },
     { 0x050d6050, "F6D6050 802.11abgn Wireless Adapter [Broadcom BCM4323]" },
     { 0x050d6051, "F5D6051 802.11b Wireless Network Adapter [ZyDAS ZD1201]" },
-    { 0x050d615a, "F7D4101 / F9L1101 802.11abgn Wireless Adapter [Broadcom BCM4323]" },
+    { 0x050d615a, "F7D4101 / F9L1101v1 802.11abgn Wireless Adapter [Broadcom BCM4323]" },
     { 0x050d7050, "F5D7050 Wireless G Adapter v1000/v2000 [Intersil ISL3887]" },
     { 0x050d7051, "F5D7051 802.11g Adapter v1000 [Broadcom 4320 USB]" },
     { 0x050d705a, "F5D7050 Wireless G Adapter v3000 [Ralink RT2571W]" },
@@ -8289,6 +8305,7 @@ static const value_string usb_products_vals[] = {
     { 0x05472750, "EZ-Link (EZLNKUSB.SYS)" },
     { 0x05472810, "Cypress ATAPI Bridge" },
     { 0x05474d90, "AmScope MD1900 camera" },
+    { 0x05477000, "PowerSpec MCE460 Front Panel LED Display" },
     { 0x05477777, "Bluetooth Device" },
     { 0x05479999, "AN2131 uninitialized (?)" },
     { 0x05481005, "EZ Cart II GameBoy Flash Programmer" },
@@ -9933,6 +9950,7 @@ static const value_string usb_products_vals[] = {
     { 0x05f92206, "Datalogic Gryphon GFS4170" },
     { 0x05f92601, "Datalogin Magellan 1000i Barcode Scanner" },
     { 0x05f92602, "Datalogic Magellan 1100i Barcode Scanner" },
+    { 0x05f94204, "Datalogic Gryphon GFS4470 Fixed Scanner" },
     { 0x05f95204, "Datalogic Gryphon GFS4170 (config mode)" },
     { 0x05fa3301, "Keyboard with PS/2 Mouse Port" },
     { 0x05fa3302, "Keyboard" },
@@ -10329,6 +10347,7 @@ static const value_string usb_products_vals[] = {
     { 0x0686401e, "Dimage E323 Camera" },
     { 0x068e00d3, "OEM 3 axis 5 button joystick" },
     { 0x068e00e2, "HFX OEM Joystick" },
+    { 0x068e00f0, "Multi-Function Panel" },
     { 0x068e00f1, "Pro Throttle" },
     { 0x068e00f2, "Flight Sim Pedals" },
     { 0x068e00f3, "Fighterstick" },
@@ -11056,6 +11075,7 @@ static const value_string usb_products_vals[] = {
     { 0x078174d1, "Sansa Clip+ (msc)" },
     { 0x078174e0, "SanDisk Sansa Fuze+" },
     { 0x078174e4, "SanDisk Sansa Clip Zip" },
+    { 0x078174e5, "Sansa Clip Zip" },
     { 0x07818181, "Pen Flash" },
     { 0x07818183, "Hi-Speed Mass Storage Device" },
     { 0x07818185, "SDCZ2 Cruzer Mini Flash Drive (older, thick)" },
@@ -11157,6 +11177,7 @@ static const value_string usb_products_vals[] = {
     { 0x07aa0018, "Wireless LAN USB-11 mini 2" },
     { 0x07aa001a, "ULUSB-11 Key" },
     { 0x07aa001c, "CG-WLUSB2GT 802.11g Wireless Adapter [Intersil ISL3880]" },
+    { 0x07aa0020, "CG-WLUSB2GTST 802.11g Wireless Adapter [Intersil ISL3887]" },
     { 0x07aa002e, "CG-WLUSB2GPX [Ralink RT2571W]" },
     { 0x07aa002f, "CG-WLUSB2GNL" },
     { 0x07aa0031, "CG-WLUSB2GS 802.11bg [Atheros AR5523]" },
@@ -11377,6 +11398,7 @@ static const value_string usb_products_vals[] = {
     { 0x07caa815, "AVerTV DVB-T Volar X (A815)" },
     { 0x07caa827, "AVerTV Hybrid Volar HX (A827)" },
     { 0x07caa867, "AVerTV DVB-T (A867)" },
+    { 0x07cab300, "A300 DVB-T TV receiver" },
     { 0x07cab800, "MR800 FM Radio" },
     { 0x07cae880, "MPEG-2 Capture Device (E880)" },
     { 0x07cae882, "MPEG-2 Capture Device (E882)" },
@@ -11653,6 +11675,7 @@ static const value_string usb_products_vals[] = {
     { 0x083a4505, "SMCWUSB-G 802.11bg" },
     { 0x083a4507, "SMCWUSBT-G2 802.11g Wireless Adapter [Atheros AR5523]" },
     { 0x083a4521, "Siemens S30863-S1016-R107-2 802.11g Wireless Adapter [Intersil ISL3887]" },
+    { 0x083a4531, "T-Com Sinus 154 data II [Intersil ISL3887]" },
     { 0x083a5046, "SpeedStream 10/100 Ethernet [pegasus]" },
     { 0x083a5501, "Wireless Adapter 11g" },
     { 0x083a6500, "Cable Modem" },
@@ -12349,6 +12372,7 @@ static const value_string usb_products_vals[] = {
     { 0x09570407, "33220A Waveform Generator" },
     { 0x09570518, "82357B GPIB Interface" },
     { 0x09570a07, "34411A Multimeter" },
+    { 0x09571507, "33210A Waveform Generator" },
     { 0x09571745, "Test and Measurement Device (IVI)" },
     { 0x09572918, "U2702A oscilloscope" },
     { 0x09592bd0, "Intelligent ISDN (Ver. 3.60.04)" },
@@ -12417,7 +12441,7 @@ static const value_string usb_products_vals[] = {
     { 0x09d3000b, "Bluetooth Adapter class 1 [BlueLight]" },
     { 0x09d70100, "NovAtel FlexPack GPS receiver" },
     { 0x09da0006, "Optical Mouse WOP-35 / Trust 450L Optical Mouse" },
-    { 0x09da000a, "Optical Mouse Opto 510D" },
+    { 0x09da000a, "Optical Mouse Opto 510D / OP-620D" },
     { 0x09da000e, "X-F710F Optical Mouse 3xFire Gaming Mouse" },
     { 0x09da0018, "Trust Human Interface Device" },
     { 0x09da001a, "Wireless Mouse & RXM-15 Receiver" },
@@ -12742,6 +12766,7 @@ static const value_string usb_products_vals[] = {
     { 0x0aad0083, "NRP-Z85" },
     { 0x0aad0095, "NRP-Z86" },
     { 0x0ab10002, "OBID RFID-Reader" },
+    { 0x0ab10004, "OBID classic-pro" },
     { 0x0aba8001, "Tracker 110 Protocol Analyzer" },
     { 0x0aba8002, "Explorer 200 Protocol Analyzer" },
     { 0x0abe0101, "SL1200 DAC" },
@@ -12836,7 +12861,7 @@ static const value_string usb_products_vals[] = {
     { 0x0b051706, "WL-167G v1 802.11g Adapter [Ralink RT2571]" },
     { 0x0b051707, "WL-167G v1 802.11g Adapter [Ralink RT2571]" },
     { 0x0b051708, "Mass Storage Device" },
-    { 0x0b05170b, "Mass Storage Device" },
+    { 0x0b05170b, "Multi card reader" },
     { 0x0b05170c, "WL-159g 802.11bg" },
     { 0x0b05170d, "802.11b/g Wireless Network Adapter" },
     { 0x0b051712, "BT-183 Bluetooth 2.0+EDR adapter" },
@@ -12875,6 +12900,7 @@ static const value_string usb_products_vals[] = {
     { 0x0b0517a0, "Xonar U3 sound card" },
     { 0x0b0517a1, "Eee Note EA800 (mass storage mode)" },
     { 0x0b0517ab, "USB-N13 802.11n Network Adapter (rev. B1) [Realtek RTL8192CU]" },
+    { 0x0b0517c7, "WL-330NUL" },
     { 0x0b0517c9, "USB-AC53 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]" },
     { 0x0b054c80, "Asus TF300 Transformer" },
     { 0x0b054c81, "Asus TF300 Transformer (USB debug mode)" },
@@ -12889,6 +12915,7 @@ static const value_string usb_products_vals[] = {
     { 0x0b054e1f, "Asus TF101 Eeepad Transformer (debug mode)" },
     { 0x0b055410, "MeMO Pad HD 7 (MTP mode)" },
     { 0x0b055412, "MeMO Pad HD 7 (PTP mode)" },
+    { 0x0b05550f, "ASUS fonepad 7" },
     { 0x0b056101, "Cable Modem" },
     { 0x0b05620a, "Remote NDIS Device" },
     { 0x0b05b700, "Broadcom Bluetooth 2.1" },
@@ -12899,6 +12926,7 @@ static const value_string usb_products_vals[] = {
     { 0x0b0c003f, "Todos C400 smartcard controller (Handelsbanken card reader)" },
     { 0x0b0c0050, "Argos Mini II Smart Card Reader (CCID)" },
     { 0x0b0d0000, "CenturyCD" },
+    { 0x0b0e034c, "Jabra UC Voice 750 MS" },
     { 0x0b0e0420, "Jabra SPEAK 510" },
     { 0x0b0e094d, "GN Netcom / Jabra REVO Wireless" },
     { 0x0b0e1022, "Jabra PRO 9450, Type 9400BS (DECT Headset)" },
@@ -17193,6 +17221,7 @@ static const value_string usb_products_vals[] = {
     { 0x26591211, "MediaTV Pro III (US)" },
     { 0x26591212, "MediaTV Pro III MiniPCIe (EU)" },
     { 0x26591213, "MediaTV Pro III MiniPCIe (US)" },
+    { 0x2676ba02, "ace" },
     { 0x2730200f, "CT-S310 Label printer" },
     { 0x27350003, "MPIO HS100" },
     { 0x27351001, "MPIO FY200" },