aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/usb.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2016-07-24 08:07:54 -0700
committerGerald Combs <gerald@wireshark.org>2016-07-24 15:08:18 +0000
commita06042d614eea9418bb625fbe38d89e45defced9 (patch)
tree2b566ebdf5f7b58242fcd812f610c7925c2ef77f /epan/dissectors/usb.c
parente878525f5ff8ab93794a17ba968c75c6676b4ad6 (diff)
[Automatic update for 2016-07-24]
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I9a88b1d2ac3fd54cd2b7bfbb652ba504db81df65 Reviewed-on: https://code.wireshark.org/review/16626 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/dissectors/usb.c')
-rw-r--r--epan/dissectors/usb.c83
1 files changed, 68 insertions, 15 deletions
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 68945ca8aa..0e7609f26f 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -894,6 +894,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x07da, "Arasan Chip Systems" },
{ 0x07de, "Diamond Multimedia" },
{ 0x07df, "David Electronics Co., Ltd" },
+ { 0x07e0, "NCP engineering GmbH" },
{ 0x07e1, "Ambient Technologies, Inc." },
{ 0x07e2, "Elmeg GmbH & Co., Ltd" },
{ 0x07e3, "Planex Communications, Inc." },
@@ -912,6 +913,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x07f7, "Century Corp." },
{ 0x07f9, "Dotop Technology, Inc." },
{ 0x07fa, "DrayTek Corp." },
+ { 0x07fc, "Thomann" },
{ 0x07fd, "Mark of the Unicorn" },
{ 0x07ff, "Unknown" },
{ 0x0801, "MagTek" },
@@ -2638,6 +2640,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x1b04, "Meilhaus Electronic GmbH" },
{ 0x1b0e, "BLUTRONICS S.r.l." },
{ 0x1b1c, "Corsair" },
+ { 0x1b1f, "eQ-3 Entwicklung GmbH" },
{ 0x1b20, "MStar Semiconductor, Inc." },
{ 0x1b22, "WiLinx Corp." },
{ 0x1b26, "Cellex Power Products, Inc." },
@@ -4515,6 +4518,8 @@ static const value_string usb_products_vals[] = {
{ 0x04210600, "Digital Pen SU-1B" },
{ 0x04210610, "CS-15 (Internet Stick 3G modem)" },
{ 0x04210661, "Lumia 620/920" },
+ { 0x04210662, "301 Dual SIM (Mass Storage)" },
+ { 0x04210663, "301 Dual SIM" },
{ 0x0421069a, "130 [RM-1035] (Charging only)" },
{ 0x042106fc, "Lumia 640 Phone" },
{ 0x04210720, "X (RM-980)" },
@@ -4822,6 +4827,7 @@ static const value_string usb_products_vals[] = {
{ 0x04518041, "Hub" },
{ 0x04518042, "Hub" },
{ 0x04518043, "Hub" },
+ { 0x04518140, "TUSB8041 4-Port Hub" },
{ 0x04518142, "TUSB8041 4-Port Hub" },
{ 0x0451926b, "TUSB9260 Boot Loader" },
{ 0x0451dbc0, "Device Bay Controller" },
@@ -5049,7 +5055,7 @@ static const value_string usb_products_vals[] = {
{ 0x045e00da, "eHome Infrared Receiver" },
{ 0x045e00db, "Natural Ergonomic Keyboard 4000 V1.0" },
{ 0x045e00dd, "Comfort Curve Keyboard 2000 V1.0" },
- { 0x045e00e1, "Wireless Laser Mouse 6000 Reciever" },
+ { 0x045e00e1, "Wireless Laser Mouse 6000 Receiver" },
{ 0x045e00f4, "LifeCam VX-6000 (SN9C20x + OV9650)" },
{ 0x045e00f5, "LifeCam VX-3000" },
{ 0x045e00f6, "Comfort Optical Mouse 1000" },
@@ -5246,6 +5252,7 @@ static const value_string usb_products_vals[] = {
{ 0x045e0780, "Comfort Curve Keyboard 3000" },
{ 0x045e0797, "Optical Mouse 200" },
{ 0x045e07a5, "Wireless Receiver 1461C" },
+ { 0x045e07ca, "Surface Pro 3 Docking Station Audio Device" },
{ 0x045e07f8, "Wired Keyboard 600 (model 1576)" },
{ 0x045e07fd, "Nano Transceiver 1.1" },
{ 0x045e930a, "ISOUSB.SYS Intel 82930 Isochronous IO Test Board" },
@@ -6404,6 +6411,7 @@ static const value_string usb_products_vals[] = {
{ 0x04a91748, "Pixma MG5150" },
{ 0x04a9174d, "MX360 ser" },
{ 0x04a9176d, "PIXMA MG2550" },
+ { 0x04a9178d, "PIXMA MG6853" },
{ 0x04a91900, "CanoScan LiDE 90" },
{ 0x04a91901, "CanoScan 8800F" },
{ 0x04a91904, "CanoScan LiDE 100" },
@@ -7979,6 +7987,7 @@ static const value_string usb_products_vals[] = {
{ 0x04f20403, "KU-0420 keyboard" },
{ 0x04f20418, "KU-0418 Tactical Pad" },
{ 0x04f20618, "RG-0618U Wireless HID Receiver & KG-0609 Wireless Keyboard with Touchpad" },
+ { 0x04f20718, "wired mouse" },
{ 0x04f20760, "Acer KU-0760 Keyboard" },
{ 0x04f20841, "HP Multimedia Keyboard" },
{ 0x04f20860, "2.4G Multimedia Wireless Kit" },
@@ -8559,9 +8568,10 @@ static const value_string usb_products_vals[] = {
{ 0x04f92015, "QL-500 P-touch label printer" },
{ 0x04f92016, "QL-550 P-touch label printer" },
{ 0x04f9201a, "PT-18R P-touch label printer" },
- { 0x04f9201b, "QL-650TD P-Touch Label Printer" },
- { 0x04f92027, "QL-560 P-Touch Label Printer" },
- { 0x04f9202b, "PT-7600 P-Touch Label Printer" },
+ { 0x04f9201b, "QL-650TD P-touch Label Printer" },
+ { 0x04f92027, "QL-560 P-touch Label Printer" },
+ { 0x04f92028, "QL-570 P-touch Label Printer" },
+ { 0x04f9202b, "PT-7600 P-touch Label Printer" },
{ 0x04f92100, "Card Reader Writer" },
{ 0x04f960a0, "ADS-2000" },
{ 0x04f960a1, "ADS-2100" },
@@ -8873,6 +8883,7 @@ static const value_string usb_products_vals[] = {
{ 0x05472750, "EZ-Link (EZLNKUSB.SYS)" },
{ 0x05472810, "Cypress ATAPI Bridge" },
{ 0x05474d90, "AmScope MD1900 camera" },
+ { 0x05476510, "Touptek UCMOS05100KPA" },
{ 0x05477000, "PowerSpec MCE460 Front Panel LED Display" },
{ 0x05477777, "Bluetooth Device" },
{ 0x05479999, "AN2131 uninitialized (?)" },
@@ -9291,8 +9302,8 @@ static const value_string usb_products_vals[] = {
{ 0x056a00bb, "PTK-1240 [Intuos4 (12x19)]" },
{ 0x056a00c0, "DTF-521" },
{ 0x056a00c4, "DTF-720" },
- { 0x056a00c5, "DTZ-20WSX [Cintiq 20WSX]" },
- { 0x056a00c6, "DTZ-12WX [Cintiq 12WX]" },
+ { 0x056a00c5, "DTZ-2000W [Cintiq 20WSX]" },
+ { 0x056a00c6, "DTZ-1200W [Cintiq 12WX]" },
{ 0x056a00c7, "DTU-1931" },
{ 0x056a00cc, "DTK-2100 [Cintiq 21UX]" },
{ 0x056a00ce, "DTU-2231" },
@@ -9331,6 +9342,7 @@ static const value_string usb_products_vals[] = {
{ 0x056a010f, "TPC10F" },
{ 0x056a0116, "TPC116" },
{ 0x056a012c, "TPC12C" },
+ { 0x056a0221, "MDP-123 [Inkling]" },
{ 0x056a0300, "CTL-471 [Bamboo Splash, One by Wacom (S)]" },
{ 0x056a0301, "CTL-671 [One by Wacom (M)]" },
{ 0x056a0302, "CTH-480 [Intuos Pen & Touch (S)]" },
@@ -9342,6 +9354,7 @@ static const value_string usb_products_vals[] = {
{ 0x056a0314, "PTH-451 [Intuos pro (S)]" },
{ 0x056a0315, "PTH-651 [Intuos pro (M)]" },
{ 0x056a0317, "PTH-851 [Intuos pro (L)]" },
+ { 0x056a0318, "CTH-301 [Bamboo]" },
{ 0x056a032f, "DTU-1031X" },
{ 0x056a0400, "PenPartner 4x5" },
{ 0x056a4001, "TPC4001" },
@@ -9838,7 +9851,7 @@ static const value_string usb_products_vals[] = {
{ 0x058f9410, "Keyboard" },
{ 0x058f9472, "Keyboard Hub" },
{ 0x058f9510, "ChunghwaTL USB02 Smartcard Reader" },
- { 0x058f9520, "EMV Certified Smart Card Reader" },
+ { 0x058f9520, "Watchdata W 1981" },
{ 0x058f9540, "AU9540 Smartcard Reader" },
{ 0x058f9720, "USB-Serial Adapter" },
{ 0x058fa014, "Asus Integrated Webcam" },
@@ -9891,6 +9904,7 @@ static const value_string usb_products_vals[] = {
{ 0x059b017c, "HDD/1394B" },
{ 0x059b0251, "Optical" },
{ 0x059b0252, "Optical" },
+ { 0x059b0275, "ST332082 0A" },
{ 0x059b0278, "LDHD-UPS [Professional Desktop Hard Drive eSATA / USB2.0]" },
{ 0x059b027a, "LPHD250-U [Portable Hard Drive Silver Series 250 Go]" },
{ 0x059b0470, "Prestige Portable Hard Drive" },
@@ -9911,6 +9925,7 @@ static const value_string usb_products_vals[] = {
{ 0x059f0829, "BigDisk Extreme+" },
{ 0x059f100c, "Rugged Triple Interface Mobile Hard Drive" },
{ 0x059f1010, "Desktop Hard Drive" },
+ { 0x059f1016, "Desktop Hard Drive" },
{ 0x059f1018, "Desktop Hard Drive" },
{ 0x059f1019, "Desktop Hard Drive" },
{ 0x059f1021, "Little Disk" },
@@ -9919,6 +9934,7 @@ static const value_string usb_products_vals[] = {
{ 0x059f1049, "rikiki Harddrive" },
{ 0x059f1052, "P'9220 Mobile Drive" },
{ 0x059f1064, "Rugged 16 and 32 GB" },
+ { 0x059f106d, "Porsche Design Mobile Drive" },
{ 0x059f106e, "Porsche Design Desktop Drive" },
{ 0x059fa601, "HardDrive" },
{ 0x059fa602, "CD R/W" },
@@ -10029,7 +10045,10 @@ static const value_string usb_products_vals[] = {
{ 0x05ac0252, "Internal Keyboard/Trackpad (ANSI)" },
{ 0x05ac0253, "Internal Keyboard/Trackpad (ISO)" },
{ 0x05ac0254, "Internal Keyboard/Trackpad (JIS)" },
+ { 0x05ac0259, "Internal Keyboard/Trackpad" },
{ 0x05ac0263, "Apple Internal Keyboard / Trackpad (MacBook Retina)" },
+ { 0x05ac0267, "Magic Keyboard A1644" },
+ { 0x05ac0273, "Internal Keyboard/Trackpad (ISO)" },
{ 0x05ac0301, "USB Mouse [Mitsumi, M4848]" },
{ 0x05ac0302, "Optical Mouse [Fujitsu]" },
{ 0x05ac0304, "Mighty Mouse [Mitsumi, M1152]" },
@@ -10130,6 +10149,7 @@ static const value_string usb_products_vals[] = {
{ 0x05ac8281, "Bluetooth Host Controller" },
{ 0x05ac8286, "Bluetooth Host Controller" },
{ 0x05ac828c, "Bluetooth Host Controller" },
+ { 0x05ac8290, "Bluetooth Host Controller" },
{ 0x05ac8300, "Built-in iSight (no firmware loaded)" },
{ 0x05ac8403, "Internal Memory Card Reader" },
{ 0x05ac8404, "Internal Memory Card Reader" },
@@ -10165,6 +10185,7 @@ static const value_string usb_products_vals[] = {
{ 0x05b44857, "M-Any DAH-210" },
{ 0x05b46001, "HYUNDAI GDS30C6001 SSFDC / MMC I/F Controller" },
{ 0x05b83002, "Scroll Mouse" },
+ { 0x05b83223, "ISY Wireless Presenter" },
{ 0x05ba0007, "Fingerprint Reader" },
{ 0x05ba0008, "Fingerprint Reader" },
{ 0x05ba000a, "Fingerprint Reader" },
@@ -10216,6 +10237,7 @@ static const value_string usb_products_vals[] = {
{ 0x05c72011, "SCorpius Keyboard" },
{ 0x05c76001, "Ten-Keypad" },
{ 0x05c80103, "FO13FF-65 PC-CAM" },
+ { 0x05c8010b, "Webcam (UVC)" },
{ 0x05c8021a, "HP Webcam" },
{ 0x05c80318, "Webcam" },
{ 0x05c80361, "SunplusIT INC. HP Truevision HD Webcam" },
@@ -10477,6 +10499,7 @@ static const value_string usb_products_vals[] = {
{ 0x05dca560, "JumpDrive FireFly" },
{ 0x05dca701, "JumpDrive FireFly" },
{ 0x05dca731, "JumpDrive FireFly" },
+ { 0x05dca762, "JumpDrive FireFly" },
{ 0x05dca768, "JumpDrive Retrax" },
{ 0x05dca790, "JumpDrive 2GB" },
{ 0x05dca811, "16GB Gizmo!" },
@@ -10487,7 +10510,9 @@ static const value_string usb_products_vals[] = {
{ 0x05dcb018, "Multi-Card Reader" },
{ 0x05dcb047, "SDHC Reader [RW047-7000]" },
{ 0x05dcba02, "Workflow CFR1" },
+ { 0x05dcba0a, "Workflow DD512" },
{ 0x05dcc753, "JumpDrive TwistTurn" },
+ { 0x05dcc75c, "JumpDrive V10" },
{ 0x05ddff31, "AWU-120" },
{ 0x05ddff32, "FriendlyNET AeroLAN AL2011" },
{ 0x05ddff35, "PCW 100 - Wireless 802.11b Adapter" },
@@ -10532,6 +10557,7 @@ static const value_string usb_products_vals[] = {
{ 0x05e30607, "Logitech G110 Hub" },
{ 0x05e30608, "Hub" },
{ 0x05e30610, "4-port hub" },
+ { 0x05e30612, "Hub" },
{ 0x05e30616, "hub" },
{ 0x05e30660, "USB 2.0 Hub" },
{ 0x05e30700, "SIIG US2256 CompactFlash Card Reader" },
@@ -10566,6 +10592,7 @@ static const value_string usb_products_vals[] = {
{ 0x05e30741, "microSD Card Reader" },
{ 0x05e30743, "SDXC and microSDXC CardReader" },
{ 0x05e30745, "Logilink CR0012" },
+ { 0x05e30751, "microSD Card Reader" },
{ 0x05e30760, "USB 2.0 Card Reader/Writer" },
{ 0x05e30761, "Genesys Mass Storage Device" },
{ 0x05e30780, "USBFS DFU Adapter" },
@@ -10641,6 +10668,7 @@ static const value_string usb_products_vals[] = {
{ 0x0609ff12, "SMK Bluetooth Device" },
{ 0x060b0001, "MacAlly Keyboard" },
{ 0x060b0230, "KSK-8003 UX Keyboard" },
+ { 0x060b0540, "DeltaCo TB-106U Keyboard" },
{ 0x060b1006, "Japanese Keyboard - 260U" },
{ 0x060b2101, "Keyboard" },
{ 0x060b2231, "KSK-6001 UELX Keyboard" },
@@ -10684,6 +10712,7 @@ static const value_string usb_products_vals[] = {
{ 0x062a0102, "Wireless Keyboard/Mouse Combo [MK1152WC]" },
{ 0x062a0201, "Defender Office Keyboard (K7310) S Zodiak KM-9010" },
{ 0x062a0252, "Emerge Uni-retractable Laser Mouse" },
+ { 0x062a2410, "Wireless PS3 gamepad" },
{ 0x062a3286, "Nano Receiver [Sandstrom Laser Mouse SMWLL11]" },
{ 0x062a4101, "Wireless Keyboard/Mouse" },
{ 0x062a6301, "Trust Wireless Optical Mouse MI-4150K" },
@@ -10735,10 +10764,12 @@ static const value_string usb_products_vals[] = {
{ 0x064ec107, "HP webcam [dv6-1190en]" },
{ 0x064ec335, "HP TrueVision HD" },
{ 0x064ed101, "Acer CrystalEye Webcam" },
+ { 0x064ed213, "UVC HD Webcam" },
{ 0x064ed217, "HP TrueVision HD" },
{ 0x064ee201, "Lenovo Integrated Webcam" },
{ 0x064ee203, "Lenovo Integrated Webcam" },
{ 0x064ee258, "HP TrueVision HD Integrated Webcam" },
+ { 0x064ee263, "HP TrueVision HD Integrated Webcam" },
{ 0x064ef102, "Lenovo Integrated Webcam [R5U877]" },
{ 0x064ef103, "Lenovo Integrated Webcam [R5U877]" },
{ 0x064ef300, "UVC 0.3M Webcam" },
@@ -10930,6 +10961,7 @@ static const value_string usb_products_vals[] = {
{ 0x067b3507, "PL3507 ATAPI6 Bridge" },
{ 0x067baaa0, "Prolific Pharos" },
{ 0x067baaa2, "PL2303 Serial Adapter (IODATA USB-RSAQ3)" },
+ { 0x067baaa3, "PL2303x Serial Adapter" },
{ 0x067c1001, "Siemens SpeedStream 100MBps Ethernet" },
{ 0x067c1022, "Siemens SpeedStream 1022 802.11b Adapter" },
{ 0x067c1023, "SpeedStream Wireless" },
@@ -11026,10 +11058,13 @@ static const value_string usb_products_vals[] = {
{ 0x0693000a, "SDCard/MMC Reader/Writer" },
{ 0x06940001, "Mindstorms Tower" },
{ 0x06940002, "Mindstorms NXT" },
+ { 0x06940005, "Mindstorms EV3" },
+ { 0x06940006, "Mindstorms EV3 Firmware Update" },
{ 0x06981786, "1300ex Monitor" },
{ 0x06982003, "CTX M730V built in Camera" },
{ 0x06989999, "VLxxxx Monitor+Hub" },
{ 0x06990347, "AFG 3022B" },
+ { 0x0699036a, "TDS 2024B" },
{ 0x069a0001, "VC010 Webcam [pwc]" },
{ 0x069a0303, "Cable Modem" },
{ 0x069a0311, "ADSL Router Remote NDIS Device" },
@@ -11277,6 +11312,7 @@ static const value_string usb_products_vals[] = {
{ 0x06d30393, "CP9500D/DW Port" },
{ 0x06d30394, "CP9000D/DW Port" },
{ 0x06d303a1, "CP9550D/DW Port" },
+ { 0x06d303a5, "CP9550DW-S" },
{ 0x06d321ba, "FOMA D905i" },
{ 0x06d33b30, "CP-D70DW / CP-D707DW" },
{ 0x06d33b31, "CP-K60DW-S" },
@@ -11455,7 +11491,7 @@ static const value_string usb_products_vals[] = {
{ 0x07110900, "SVGA Adapter" },
{ 0x07115001, "Trigger UV-002BD[Startech USBVGAE]" },
{ 0x07115100, "Magic Control Technology Corp. (USB2VGA dongle)" },
- { 0x07140003, "ADB to USB convertor" },
+ { 0x07140003, "ADB converter" },
{ 0x07180002, "SuperDisk 120MB" },
{ 0x07180003, "SuperDisk 120MB (Authenticated)" },
{ 0x07180060, "Flash Drive" },
@@ -11476,6 +11512,7 @@ static const value_string usb_products_vals[] = {
{ 0x0718d000, "Disc Stakka CD/DVD Manager" },
{ 0x071b0002, "DTI-56362-USB Digital Interface Unit" },
{ 0x071b0101, "Audio4-USB DSP Data Acquisition Unit" },
+ { 0x071b0184, "Archos 2 8GB EM184RB" },
{ 0x071b0201, "Audio4-5410 DSP Data Acquisition Unit" },
{ 0x071b0301, "SB-USB JTAG Emulator" },
{ 0x071b3203, "Rockchip Media Player" },
@@ -11546,8 +11583,8 @@ static const value_string usb_products_vals[] = {
{ 0x07330630, "VQ630 Dual Mode Digital Camera(Bulk)" },
{ 0x07330631, "Hercules Dualpix" },
{ 0x07330780, "Smart Cam Deluxe(composite)" },
- { 0x07331310, "Epsilon 1.3/Jenoptik JD C1.3/UMAX AstraPix 470" },
- { 0x07331311, "Digital Dream Epsilon 1.3" },
+ { 0x07331310, "Epsilon 1.3/Jenoptik JD C1.3/UMAX AstraPix 470 (mass storage mode)" },
+ { 0x07331311, "Epsilon 1.3/Jenoptik JD C1.3/UMAX AstraPix 470 (PC Cam mode)" },
{ 0x07331314, "Mercury 2.1MEG Deluxe Classic Cam" },
{ 0x07332211, "Jenoptik jdc 21 LCD Camera" },
{ 0x07332221, "Mercury Digital Pro 3.1p" },
@@ -11624,7 +11661,7 @@ static const value_string usb_products_vals[] = {
{ 0x07631015, "M-Audio Keystation" },
{ 0x07631020, "Midisport 4x4" },
{ 0x07631021, "MidiSport 4x4" },
- { 0x07631030, "Midisport 8x8" },
+ { 0x07631030, "M-Audio MIDISPORT 8x8" },
{ 0x07631031, "MidiSport 8x8/s Loader" },
{ 0x07631033, "MidiSport 8x8/s" },
{ 0x07631040, "M-Audio MidiSport 2x4 Loader" },
@@ -11649,7 +11686,7 @@ static const value_string usb_products_vals[] = {
{ 0x0763201b, "M-Audio RunTime DFU" },
{ 0x0763201d, "M-Audio Producer" },
{ 0x07632024, "M-Audio Fast Track MKII" },
- { 0x07632080, "M-Audio RunTime DFU" },
+ { 0x07632080, "M-Audio Fast Track Ultra" },
{ 0x07632081, "M-Audio RunTime DFU / Fast Track Ultra 8R" },
{ 0x07632803, "M-Audio Audiophile DFU" },
{ 0x07632804, "M-Audio MobilePre DFU" },
@@ -11663,6 +11700,7 @@ static const value_string usb_products_vals[] = {
{ 0x07640501, "CP1500 AVR UPS" },
{ 0x07640601, "PR1500LCDRT2U UPS" },
{ 0x07655001, "Huey PRO Colorimeter" },
+ { 0x07655010, "X-Rite Pantone Color Sensor" },
{ 0x07655020, "i1 Display Pro" },
{ 0x07656003, "ColorMunki Smile" },
{ 0x0765d094, "X-Rite DTP94 [Quato Silver Haze Pro]" },
@@ -11735,9 +11773,11 @@ static const value_string usb_products_vals[] = {
{ 0x0781540e, "Cruzer Contour Flash Drive" },
{ 0x07815530, "Cruzer" },
{ 0x07815567, "Cruzer Blade" },
+ { 0x0781556b, "Cruzer Edge" },
{ 0x0781556c, "Ultra" },
{ 0x0781556d, "Memory Vault" },
{ 0x07815571, "Cruzer Fit" },
+ { 0x07815575, "Cruzer Glide" },
{ 0x07815576, "Cruzer Facet" },
{ 0x0781557d, "Cruzer Force (64GB)" },
{ 0x07815580, "SDCZ80 Flash Drive" },
@@ -11806,6 +11846,7 @@ static const value_string usb_products_vals[] = {
{ 0x0781a7e8, "SDDR-113 MicroMate SDHC Reader" },
{ 0x0781b2b3, "SDDR-103 MobileMate SD+ Reader" },
{ 0x0781b4b5, "SDDR-89 V4 ImageMate 12-in-1 Reader" },
+ { 0x0781b6ba, "CF SDDR-289" },
{ 0x07830003, "LTC31 SmartCard Reader" },
{ 0x07830006, "LTC31v2" },
{ 0x07830009, "KBR36" },
@@ -12194,6 +12235,7 @@ static const value_string usb_products_vals[] = {
{ 0x07cf4107, "CW-L300 Device" },
{ 0x07cf4500, "LV-20 Digital Camera" },
{ 0x07cf6101, "fx-9750gII" },
+ { 0x07cf6102, "fx-CP400" },
{ 0x07cf6801, "PL-40R" },
{ 0x07cf6802, "MIDI Keyboard" },
{ 0x07d00001, "Digital Video Creator I" },
@@ -12256,6 +12298,7 @@ static const value_string usb_products_vals[] = {
{ 0x07d1f101, "DBT-122 Bluetooth" },
{ 0x07d1fc01, "DBT-120 Bluetooth Adapter" },
{ 0x07de2820, "VC500 Video Capture Dongle" },
+ { 0x07e04742, "VPN GovNet Box" },
{ 0x07e15201, "V.90 Modem" },
{ 0x07e40967, "SCard R/W CSR-145" },
{ 0x07e40968, "SCard R/W CSR-145" },
@@ -12273,8 +12316,9 @@ static const value_string usb_products_vals[] = {
{ 0x07fa1196, "BWIFI-USB54AR 802.11bg" },
{ 0x07faa904, "BeWAN ADSL" },
{ 0x07faa905, "BeWAN ADSL ST" },
+ { 0x07fc1113, "SWISSONIC EasyKeys61 Midikeyboard" },
{ 0x07fd0000, "FastLane MIDI Interface" },
- { 0x07fd0001, "FastLane Quad MIDI Interface" },
+ { 0x07fd0001, "MIDI Interface" },
{ 0x07fd0002, "MOTU Audio for 64 bit" },
{ 0x07ff00ff, "Portable Hard Drive" },
{ 0x08010001, "Mini Swipe Reader (Keyboard Emulation)" },
@@ -12441,6 +12485,7 @@ static const value_string usb_products_vals[] = {
{ 0x08469010, "WNDA3100v1 802.11abgn [Atheros AR9170+AR9104]" },
{ 0x08469011, "WNDA3100v2 802.11abgn [Broadcom BCM4323]" },
{ 0x08469012, "WNDA4100 802.11abgn 3x3:3 [Ralink RT3573]" },
+ { 0x08469014, "WNDA3100v3 802.11abgn 2x2:2 [MediaTek MT7632U]" },
{ 0x08469018, "WNDA3200 802.11abgn Wireless Adapter [Atheros AR7010+AR9280]" },
{ 0x08469020, "WNA3100(v1) Wireless-N 300 [Broadcom BCM43231]" },
{ 0x08469021, "WNA3100M(v1) Wireless-N 300 [Realtek RTL8192CU]" },
@@ -12621,6 +12666,7 @@ static const value_string usb_products_vals[] = {
{ 0x08ca2011, "Pocket CAM 3 Mega (storage)" },
{ 0x08ca2016, "PocketCam 2 Mega" },
{ 0x08ca2018, "Pencam SD 2M" },
+ { 0x08ca2019, "Pencam SD 2M (mass storage mode)" },
{ 0x08ca2020, "Slim 3000F" },
{ 0x08ca2022, "Slim 3200" },
{ 0x08ca2024, "Pocket DV3500" },
@@ -12712,6 +12758,7 @@ static const value_string usb_products_vals[] = {
{ 0x08ec204a, "TravelDrive" },
{ 0x08ec204b, "TravelDrive" },
{ 0x08ed0002, "CECT M800 memory card" },
+ { 0x08f00005, "CardScan 800c" },
{ 0x08f2007f, "Super Q2 Tablet" },
{ 0x08f70001, "LabPro" },
{ 0x08f70002, "EasyTemp/Go!Temp" },
@@ -12882,6 +12929,7 @@ static const value_string usb_products_vals[] = {
{ 0x091e2535, "Edge 800" },
{ 0x091e253c, "GPSmap 62sc" },
{ 0x091e255b, "Nuvi 2505LM" },
+ { 0x091e26a1, "Nuvi 55" },
{ 0x09207500, "Network Interface" },
{ 0x09211001, "GoCOM232 Serial" },
{ 0x09220007, "LabelWriter 330" },
@@ -12894,6 +12942,7 @@ static const value_string usb_products_vals[] = {
{ 0x0923010f, "SIIG MobileCam" },
{ 0x092423dd, "DocuPrint M760 (X760_USB)" },
{ 0x09243ce8, "Phaser 3428 Printer" },
+ { 0x09243cea, "Phaser 3125" },
{ 0x09243d5b, "Phaser 6115MFP TWAIN Scanner" },
{ 0x09243d6d, "WorkCentre 6015N/NI" },
{ 0x0924420f, "WorkCentre PE220 Series" },
@@ -12949,6 +12998,7 @@ static const value_string usb_products_vals[] = {
{ 0x0930070b, "Pocket PC e800 Series" },
{ 0x09300963, "Toshiba Excite AT300" },
{ 0x09300a07, "WLM-10U1 802.11abgn Wireless Adapter [Ralink RT3572]" },
+ { 0x09300a08, "WLM-20U2/GN-1080 802.11abgn Wireless Adapter [Atheros AR7010+AR9280]" },
{ 0x09300a13, "AX88179 Gigabit Ethernet [Toshiba]" },
{ 0x09300b05, "PX1220E-1G25 External hard drive" },
{ 0x09300b09, "PX1396E-3T01 External hard drive" },
@@ -13001,7 +13051,7 @@ static const value_string usb_products_vals[] = {
{ 0x0930653d, "Kingston DataTraveler 2.0 Stick (1GB)" },
{ 0x0930653e, "Flash Memory" },
{ 0x09306540, "TransMemory Flash Memory" },
- { 0x09306544, "TransMemory-Mini / Kingston DataTraveler 2.0 Stick (2GB)" },
+ { 0x09306544, "TransMemory-Mini / Kingston DataTraveler 2.0 Stick" },
{ 0x09306545, "Kingston DataTraveler 102/2.0 / HEMA Flash Drive 2 GB / PNY Attache 4GB Stick" },
{ 0x09307100, "Toshiba Thrive AT100/AT105" },
{ 0x09320300, "VideoAdvantage" },
@@ -13072,6 +13122,7 @@ static const value_string usb_products_vals[] = {
{ 0x09511603, "DataTraveler 1GB/2GB Pen Drive" },
{ 0x09511606, "Eee PC 701 SD Card Reader [ENE UB6225]" },
{ 0x09511607, "DataTraveler 100" },
+ { 0x0951160b, "DataTraveler 2.0 (2GB)" },
{ 0x0951160d, "DataTraveler Vault Privacy" },
{ 0x0951160e, "DT110P/1GB Capless" },
{ 0x09511613, "DataTraveler DT101C Flash Drive" },
@@ -13087,8 +13138,9 @@ static const value_string usb_products_vals[] = {
{ 0x09511643, "DataTraveler G3" },
{ 0x09511653, "Data Traveler 100 G2 8 GiB" },
{ 0x09511656, "DataTraveler Ultimate G2" },
+ { 0x09511660, "Data Traveller 108" },
{ 0x09511665, "Digital DataTraveler SE9 64GB" },
- { 0x09511666, "DataTraveler G4" },
+ { 0x09511666, "DataTraveler 100 G3/G4/SE9 G2" },
{ 0x09511689, "DataTraveler SE9" },
{ 0x0951168a, "DataTraveler Micro" },
{ 0x0951168c, "DT Elite 3.0" },
@@ -17648,6 +17700,7 @@ static const value_string usb_products_vals[] = {
{ 0x1b1c1a01, "Flash Voyager GT" },
{ 0x1b1c1a0a, "Survivor Stealth Flash Drive" },
{ 0x1b1c1a90, "Flash Voyager GT" },
+ { 0x1b1fc00f, "HM-CFG-USB/HM-CFG-USB-2 [HomeMatic Configuration adapter]" },
{ 0x1b320064, "Pleo robotic dinosaur" },
{ 0x1b3b2933, "PC Camera/Webcam controller" },
{ 0x1b3b2935, "PC Camera/Webcam controller" },