aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/usb.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/usb.c')
-rw-r--r--epan/dissectors/usb.c55
1 files changed, 50 insertions, 5 deletions
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index d212411e44..cc1a21980d 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -64,6 +64,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x0386, "LTS" },
{ 0x03d9, "Shenzhen Sinote Tech-Electron Co., Ltd" },
{ 0x03da, "Bernd Walter Computer Technology" },
+ { 0x03e7, "Intel" },
{ 0x03e8, "EndPoints, Inc." },
{ 0x03e9, "Thesys Microelectronics" },
{ 0x03ea, "Data Broadcasting Corp." },
@@ -3062,6 +3063,7 @@ static const value_string usb_products_vals[] = {
{ 0x03860001, "PSX for USB Converter" },
{ 0x03d90499, "SE340D PC Remote Control" },
{ 0x03da0002, "HD44780 LCD interface" },
+ { 0x03e72150, "Myriad VPU [Movidius Neural Compute Stick]" },
{ 0x03e80004, "SE401 Webcam" },
{ 0x03e80008, "101 Ethernet [klsi]" },
{ 0x03e80015, "ATAPI Enclosure" },
@@ -3106,6 +3108,7 @@ static const value_string usb_products_vals[] = {
{ 0x03eb2106, "STK600 development board" },
{ 0x03eb2107, "AVR Dragon" },
{ 0x03eb2109, "STK541 ZigBee Development Board" },
+ { 0x03eb210a, "AT86RF230 [RZUSBSTICK] transceiver" },
{ 0x03eb210d, "XPLAIN evaluation kit (CDC ACM)" },
{ 0x03eb2110, "AVR JTAGICE3 Debugger and Programmer" },
{ 0x03eb2111, "Xplained Pro board debugger and programmer" },
@@ -3195,6 +3198,7 @@ static const value_string usb_products_vals[] = {
{ 0x03f00217, "LaserJet 2200" },
{ 0x03f00218, "APOLLO P2500/2600" },
{ 0x03f00221, "StreamSmart 400 [F2235AA]" },
+ { 0x03f00223, "Digital Drive Flash Reader" },
{ 0x03f0022a, "Laserjet CP1525nw" },
{ 0x03f00241, "Link-5 micro dongle" },
{ 0x03f00304, "DeskJet 810c/812c" },
@@ -3229,6 +3233,7 @@ static const value_string usb_products_vals[] = {
{ 0x03f00611, "OfficeJet K60xi" },
{ 0x03f00612, "business inkjet 3000" },
{ 0x03f00624, "Bluetooth Dongle" },
+ { 0x03f00641, "X1200 Optical Mouse" },
{ 0x03f00701, "ScanJet 5300c/5370c" },
{ 0x03f00704, "DeskJet 825c" },
{ 0x03f00705, "ScanJet 4400c" },
@@ -3307,6 +3312,7 @@ static const value_string usb_products_vals[] = {
{ 0x03f01524, "Smart Card Keyboard - KR" },
{ 0x03f01539, "Mini Magnetic Stripe Reader" },
{ 0x03f01541, "Prime [G8X92AA]" },
+ { 0x03f0154a, "Laser Mouse" },
{ 0x03f01602, "PhotoSmart 330 series" },
{ 0x03f01604, "DeskJet 940c" },
{ 0x03f01605, "ScanJet 5530C PhotoSmart" },
@@ -3521,6 +3527,7 @@ static const value_string usb_products_vals[] = {
{ 0x03f05307, "v165w Stick" },
{ 0x03f05311, "OfficeJet 6300" },
{ 0x03f05312, "Officejet Pro 8500A" },
+ { 0x03f05317, "Color LaserJet CP2025 series" },
{ 0x03f05411, "OfficeJet 4300" },
{ 0x03f05511, "DeskJet F300 series" },
{ 0x03f05611, "PhotoSmart C3180" },
@@ -3662,6 +3669,7 @@ static const value_string usb_products_vals[] = {
{ 0x03f09c02, "PhotoSmart M440 series" },
{ 0x03f0a004, "DeskJet 5850c" },
{ 0x03f0a011, "Deskjet 3050A" },
+ { 0x03f0a407, "Wireless Optical Comfort Mouse" },
{ 0x03f0b002, "PhotoSmart 7200 series" },
{ 0x03f0b102, "PhotoSmart 7200 series" },
{ 0x03f0b107, "v255w/c310w Flash Drive" },
@@ -3782,6 +3790,8 @@ static const value_string usb_products_vals[] = {
{ 0x0403a951, "HCP HIT GSM/GPRS modem [Cinterion MC55i]" },
{ 0x0403a9a0, "FT2232D - Dual UART/FIFO IC - FTDI" },
{ 0x0403abb8, "Lego Mindstorms NXTCam" },
+ { 0x0403b0c2, "iID contactless RFID device" },
+ { 0x0403b0c3, "iID contactless RFID device" },
{ 0x0403b810, "US Interface Navigator (CAT and 2nd PTT lines)" },
{ 0x0403b811, "US Interface Navigator (WKEY and FSK lines)" },
{ 0x0403b812, "US Interface Navigator (RS232 and CONFIG lines)" },
@@ -4116,6 +4126,7 @@ static const value_string usb_products_vals[] = {
{ 0x040a6029, "i900" },
{ 0x040a602a, "i900" },
{ 0x040b0a68, "Func MS-3 gaming mouse [WT6573F MCU]" },
+ { 0x040b2367, "Human Interface Device [HP CalcPad 200 Calculator and Numeric Keypad]" },
{ 0x040b6510, "Weltrend Bar Code Reader" },
{ 0x040b6520, "XBOX Xploder" },
{ 0x040b6533, "Speed-Link Competition Pro" },
@@ -4435,6 +4446,10 @@ static const value_string usb_products_vals[] = {
{ 0x04210104, "ADL Re-Flashing Engine Parent" },
{ 0x04210105, "Nokia Firmware Upgrade Mode" },
{ 0x04210106, "ROM Parent" },
+ { 0x0421010d, "E75 (Storage Mode)" },
+ { 0x0421010e, "E75 (PC Suite mode)" },
+ { 0x0421010f, "E75 (Media transfer mode)" },
+ { 0x04210110, "E75 (Imaging Mode)" },
{ 0x04210154, "Nokia 5800 XpressMusic" },
{ 0x04210155, "Nokia 5800 XpressMusic v2" },
{ 0x04210156, "5800 XpressMusic (Storage mode)" },
@@ -5300,6 +5315,7 @@ static const value_string usb_products_vals[] = {
{ 0x045e0736, "Sidewinder X5 Mouse" },
{ 0x045e0737, "Compact Optical Mouse 500" },
{ 0x045e0745, "Nano Transceiver v1.0 for Bluetooth" },
+ { 0x045e074a, "LifeCam VX-500 [1357]" },
{ 0x045e0750, "Wired Keyboard 600" },
{ 0x045e0752, "Wired Keyboard 400" },
{ 0x045e075d, "LifeCam Cinema" },
@@ -5309,11 +5325,13 @@ static const value_string usb_products_vals[] = {
{ 0x045e0768, "Sidewinder X4" },
{ 0x045e076c, "Comfort Mouse 4500" },
{ 0x045e076d, "LifeCam HD-5000" },
+ { 0x045e0770, "LifeCam VX-700" },
{ 0x045e0772, "LifeCam Studio" },
{ 0x045e0779, "LifeCam HD-3000" },
{ 0x045e077f, "LifeChat LX-6000 Headset" },
{ 0x045e0780, "Comfort Curve Keyboard 3000" },
{ 0x045e0797, "Optical Mouse 200" },
+ { 0x045e0799, "Surface Pro embedded keyboard" },
{ 0x045e07a5, "Wireless Receiver 1461C" },
{ 0x045e07b9, "Wired Keyboard 200" },
{ 0x045e07ca, "Surface Pro 3 Docking Station Audio Device" },
@@ -5367,7 +5385,7 @@ static const value_string usb_products_vals[] = {
{ 0x0461081c, "Elitegroup ECS-C11 Camera" },
{ 0x0461081d, "Elitegroup ECS-C11 Storage" },
{ 0x04610a00, "Micro Innovations Web Cam 320" },
- { 0x04614d01, "Comfort Keyboard" },
+ { 0x04614d01, "Comfort Keyboard / Kensington Orbit Elite" },
{ 0x04614d02, "Mouse-in-a-Box" },
{ 0x04614d03, "Kensington Mouse-in-a-box" },
{ 0x04614d04, "Mouse" },
@@ -5385,6 +5403,7 @@ static const value_string usb_products_vals[] = {
{ 0x04614d75, "Rocketfish RF-FLBTAD Bluetooth Adapter" },
{ 0x04614d81, "Dell N889 Optical Mouse" },
{ 0x04614de7, "webcam" },
+ { 0x04614e04, "Lenovo Keyboard KB1021" },
{ 0x04630001, "UPS" },
{ 0x0463ffff, "UPS" },
{ 0x046a0001, "Keyboard" },
@@ -5558,6 +5577,7 @@ static const value_string usb_products_vals[] = {
{ 0x046d0a45, "960 Headset" },
{ 0x046d0a4d, "G430 Surround Sound Gaming Headset" },
{ 0x046d0a5b, "G933 Wireless Headset Dongle" },
+ { 0x046d0a66, "[G533 Wireless Headset Dongle]" },
{ 0x046d0b02, "C-UV35 [Bluetooth Mini-Receiver] (HID proxy mode)" },
{ 0x046d8801, "Video Camera" },
{ 0x046db014, "Bluetooth Mouse M336/M337/M535" },
@@ -5730,6 +5750,7 @@ static const value_string usb_products_vals[] = {
{ 0x046dc31c, "Keyboard K120" },
{ 0x046dc31d, "Media Keyboard K200" },
{ 0x046dc31f, "Comfort Keyboard K290" },
+ { 0x046dc328, "Corded Keyboard K280e" },
{ 0x046dc332, "G502 Proteus Spectrum Optical Mouse" },
{ 0x046dc335, "G910 Orion Spectrum Mechanical Keyboard" },
{ 0x046dc401, "TrackMan Marble Wheel" },
@@ -6091,6 +6112,7 @@ static const value_string usb_products_vals[] = {
{ 0x04820203, "AH-K3001V" },
{ 0x04820204, "iBurst Terminal" },
{ 0x04820408, "FS-1320D Printer" },
+ { 0x0482069b, "ECOSYS M2635dn" },
{ 0x04830137, "BeWAN ADSL USB ST (blue or green)" },
{ 0x04830138, "Unicorn II (ST70138B + MTC-20174TQ chipset)" },
{ 0x04831307, "Cytronix 6in1 Card Reader" },
@@ -6202,6 +6224,7 @@ static const value_string usb_products_vals[] = {
{ 0x04991054, "S90XS Keyboard/Music Synthesizer" },
{ 0x0499160f, "P-105" },
{ 0x04991613, "Clavinova CLP535" },
+ { 0x04991704, "Steinberg UR44" },
{ 0x04992000, "DGP-7" },
{ 0x04992001, "DGP-5" },
{ 0x04993001, "YST-MS55D USB Speaker" },
@@ -6609,12 +6632,12 @@ static const value_string usb_products_vals[] = {
{ 0x04a92229, "CanoScan 8600F" },
{ 0x04a92602, "MultiPASS C555" },
{ 0x04a92603, "MultiPASS C755" },
- { 0x04a9260a, "CAPT Printer" },
+ { 0x04a9260a, "LBP810" },
{ 0x04a9260e, "LBP-2000" },
{ 0x04a92610, "MPC600F" },
{ 0x04a92611, "SmartBase MPC400" },
{ 0x04a92612, "MultiPASS C855" },
- { 0x04a92617, "CAPT Printer" },
+ { 0x04a92617, "LBP1210" },
{ 0x04a9261a, "iR1600" },
{ 0x04a9261b, "iR1610" },
{ 0x04a9261c, "iC2300" },
@@ -6669,9 +6692,9 @@ static const value_string usb_products_vals[] = {
{ 0x04a92671, "iR5570/iR6570" },
{ 0x04a92672, "iR C3170" },
{ 0x04a92673, "iR 3170C EUR" },
- { 0x04a92674, "L120" },
+ { 0x04a92674, "FAX-L120" },
{ 0x04a92675, "iR2830" },
- { 0x04a92676, "CAPT Device" },
+ { 0x04a92676, "LBP2900" },
{ 0x04a92677, "iR C2570" },
{ 0x04a92678, "iR 2570C EUR" },
{ 0x04a92679, "CAPT Device" },
@@ -6682,6 +6705,7 @@ static const value_string usb_products_vals[] = {
{ 0x04a92686, "MF6500 series" },
{ 0x04a92687, "iR4530" },
{ 0x04a92688, "LBP3460" },
+ { 0x04a92689, "FAX-L180/L380S/L398S" },
{ 0x04a9268c, "iR C6870" },
{ 0x04a9268d, "iR 6870C EUR" },
{ 0x04a9268e, "iR C5870" },
@@ -6693,6 +6717,7 @@ static const value_string usb_products_vals[] = {
{ 0x04a926b5, "MF4200 series" },
{ 0x04a926da, "LBP3010B printer" },
{ 0x04a926e6, "iR1024" },
+ { 0x04a9271a, "LBP6000" },
{ 0x04a92736, "I-SENSYS MF4550d" },
{ 0x04a92737, "MF4410" },
{ 0x04a93041, "PowerShot S10" },
@@ -7013,6 +7038,7 @@ static const value_string usb_products_vals[] = {
{ 0x04a932ad, "PowerShot SX410 IS" },
{ 0x04a932b1, "SELPHY CP1200" },
{ 0x04a932b2, "PowerShot G9 X" },
+ { 0x04a932b4, "EOS Rebel T6" },
{ 0x04a932bb, "EOS M5" },
{ 0x04a932bf, "PowerShot SX420 IS" },
{ 0x04a932c1, "PowerShot ELPH 180 / IXUS 175" },
@@ -7513,6 +7539,8 @@ static const value_string usb_products_vals[] = {
{ 0x04c51140, "FOMA F903iX HIGH-SPEED" },
{ 0x04c51150, "fi-6230" },
{ 0x04c5125a, "PalmSecure Sensor Device - MP" },
+ { 0x04c5200f, "Sigma DP2 (Mass Storage)" },
+ { 0x04c52010, "Sigma DP2 (PictBridge)" },
{ 0x04c5201d, "SATA 3.0 6Gbit/s Adaptor [GROOVY]" },
{ 0x04c80720, "Digital Color Camera" },
{ 0x04c80721, "e-miniD Camera" },
@@ -7648,6 +7676,8 @@ static const value_string usb_products_vals[] = {
{ 0x04cb0271, "Fuji FinePix HS30EXR" },
{ 0x04cb0278, "FinePix JV300" },
{ 0x04cb0288, "Fuji FinePix XF1" },
+ { 0x04cb02c5, "FinePix S9900W Digital Camera (PTP)" },
+ { 0x04cb5006, "ASK-300" },
{ 0x04cc1122, "Hub" },
{ 0x04cc1520, "USB 2.0 Hub (Avocent KVM)" },
{ 0x04cc1521, "USB 2.0 Hub" },
@@ -7733,9 +7763,11 @@ static const value_string usb_products_vals[] = {
{ 0x04d9a01c, "wireless multimedia keyboard with trackball [Trust ADURA 17911]" },
{ 0x04d9a050, "Chatman V1" },
{ 0x04d9a055, "Keyboard" },
+ { 0x04d9a096, "Keyboard" },
{ 0x04d9a09f, "E-Signal LUOM G10 Mechanical Gaming Mouse" },
{ 0x04d9a100, "Mouse [HV-MS735]" },
{ 0x04d9a11b, "Mouse [MX-3200]" },
+ { 0x04d9e002, "MCU" },
{ 0x04da0901, "LS-120 Camera" },
{ 0x04da0912, "SDR-S10" },
{ 0x04da0b01, "CD-R/RW Drive" },
@@ -8232,6 +8264,7 @@ static const value_string usb_products_vals[] = {
{ 0x04f2b104, "CNF7069 Webcam" },
{ 0x04f2b107, "CNF7070 Webcam" },
{ 0x04f2b14c, "CNF8050 Webcam" },
+ { 0x04f2b159, "CNF8243 Webcam" },
{ 0x04f2b15c, "Sony Vaio Integrated Camera" },
{ 0x04f2b175, "4-Port Hub" },
{ 0x04f2b1aa, "Webcam-101" },
@@ -8262,6 +8295,7 @@ static const value_string usb_products_vals[] = {
{ 0x04f2b444, "Lenovo Integrated Webcam" },
{ 0x04f3000a, "Touchscreen" },
{ 0x04f30103, "ActiveJet K-2024 Multimedia Keyboard" },
+ { 0x04f3016f, "Touchscreen" },
{ 0x04f301a4, "Wireless Keyboard" },
{ 0x04f30201, "Touchscreen" },
{ 0x04f30210, "Optical Mouse" },
@@ -8311,6 +8345,7 @@ static const value_string usb_products_vals[] = {
{ 0x04f9002c, "Printer" },
{ 0x04f9002d, "Printer" },
{ 0x04f90039, "HL-5340 series" },
+ { 0x04f90041, "HL-2250DN Laser Printer" },
{ 0x04f90042, "HL-2270DW Laser Printer" },
{ 0x04f90100, "MFC8600/9650 series" },
{ 0x04f90101, "MFC9600/9870 series" },
@@ -8498,6 +8533,7 @@ static const value_string usb_products_vals[] = {
{ 0x04f9021c, "MFC-9320CW" },
{ 0x04f9021d, "MFC-9120CN" },
{ 0x04f9021e, "DCP-9010CN" },
+ { 0x04f9021f, "DCP-8085DN" },
{ 0x04f90220, "MFC-9010CN" },
{ 0x04f90222, "DCP-195C" },
{ 0x04f90223, "DCP-365CN" },
@@ -8522,6 +8558,7 @@ static const value_string usb_products_vals[] = {
{ 0x04f9023f, "MFC-8680DN" },
{ 0x04f90240, "MFC-J950DN" },
{ 0x04f90248, "DCP-7055 scanner/printer" },
+ { 0x04f9024e, "MFC-7460DN" },
{ 0x04f90253, "DCP-J125" },
{ 0x04f90254, "DCP-J315W" },
{ 0x04f90255, "DCP-J515W" },
@@ -8541,6 +8578,7 @@ static const value_string usb_products_vals[] = {
{ 0x04f9026d, "MFC-J805D" },
{ 0x04f9026e, "MFC-J855DN" },
{ 0x04f9026f, "MFC-J270W" },
+ { 0x04f90270, "MFC-7360N" },
{ 0x04f90273, "DCP-7057 scanner/printer" },
{ 0x04f90276, "MFC-5895CW" },
{ 0x04f90278, "MFC-J410W" },
@@ -8772,6 +8810,7 @@ static const value_string usb_products_vals[] = {
{ 0x04f92027, "QL-560 P-touch Label Printer" },
{ 0x04f92028, "QL-570 P-touch Label Printer" },
{ 0x04f9202b, "PT-7600 P-touch Label Printer" },
+ { 0x04f92041, "PT-2730 P-touch Label Printer" },
{ 0x04f92061, "PT-P700 P-touch Label Printer" },
{ 0x04f92064, "PT-P700 P-touch Label Printer RemovableDisk" },
{ 0x04f92100, "Card Reader Writer" },
@@ -9085,6 +9124,7 @@ static const value_string usb_products_vals[] = {
{ 0x05472727, "Xircom PGUNET USB-USB Bridge" },
{ 0x05472750, "EZ-Link (EZLNKUSB.SYS)" },
{ 0x05472810, "Cypress ATAPI Bridge" },
+ { 0x05474018, "AmScope MU1803" },
{ 0x05474d90, "AmScope MD1900 camera" },
{ 0x05476010, "AmScope MU1000 camera" },
{ 0x05476510, "Touptek UCMOS05100KPA" },
@@ -9307,6 +9347,7 @@ static const value_string usb_products_vals[] = {
{ 0x054c06bb, "WALKMAN NWZ-F805" },
{ 0x054c06c3, "RC-S380" },
{ 0x054c07c4, "ILCE-6000 (aka Alpha-6000) in Mass Storage mode" },
+ { 0x054c0847, "WG-C10 Portable Wireless Server" },
{ 0x054c088c, "Portable Headphone Amplifier" },
{ 0x054c08b7, "ILCE-6000 (aka Alpha-6000) in MTP mode" },
{ 0x054c094e, "ILCE-6000 (aka Alpha-6000) in PC Remote mode" },
@@ -9584,6 +9625,8 @@ static const value_string usb_products_vals[] = {
{ 0x056a0354, "DTH-1620 [Cintiq Pro 16] touchscreen" },
{ 0x056a0357, "PTH-660 [Intuos Pro (M)]" },
{ 0x056a0358, "PTH-860 [Intuos Pro (L)]" },
+ { 0x056a035a, "DTH-1152 tablet" },
+ { 0x056a0368, "DTH-1152 touchscreen" },
{ 0x056a0400, "PenPartner 4x5" },
{ 0x056a4001, "TPC4001" },
{ 0x056a4004, "TPC4004" },
@@ -9600,6 +9643,7 @@ static const value_string usb_products_vals[] = {
{ 0x056d0002, "HID Monitor Controls" },
{ 0x056d0003, "Device Bay Controller" },
{ 0x056e0002, "29UO Mouse" },
+ { 0x056e0057, "M-PGDL Mouse" },
{ 0x056e0072, "Mouse" },
{ 0x056e200c, "LD-USB/TX" },
{ 0x056e4002, "Laneed 100Mbps Ethernet LD-USB/TX [pegasus]" },
@@ -11040,6 +11084,7 @@ static const value_string usb_products_vals[] = {
{ 0x06540006, "Hub" },
{ 0x06540007, "Device Bay Controller" },
{ 0x06540016, "Hub" },
+ { 0x06580200, "Aeotec Z-Stick Gen5 (ZW090) - UZB" },
{ 0x065a0001, "Opticon OPR-2001 / NLV-1001 (keyboard mode)" },
{ 0x065a0009, "NLV-1001 (serial mode) / OPN-2001 [Opticon]" },
{ 0x06630103, "CobraPad" },
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 22:30:19 +0000