diff options
Diffstat (limited to 'epan/dissectors/usb.c')
-rw-r--r-- | epan/dissectors/usb.c | 91 |
1 files changed, 70 insertions, 21 deletions
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c index 460b661a8e..c5d298f819 100644 --- a/epan/dissectors/usb.c +++ b/epan/dissectors/usb.c @@ -3782,6 +3782,7 @@ static const value_string usb_products_vals[] = { { 0x04038370, "7 Port Hub" }, { 0x04038371, "PS/2 Keyboard And Mouse" }, { 0x04038372, "FT8U100AX Serial Port" }, + { 0x040387d0, "Cressi Dive Computer Interface" }, { 0x04038a28, "Rainforest Automation ZigBee Controller" }, { 0x04038a98, "TIAO Multi-Protocol Adapter" }, { 0x04038b28, "Alpermann+Velte TCI70" }, @@ -3814,6 +3815,7 @@ static const value_string usb_products_vals[] = { { 0x0403bcd8, "Stellaris Development Board" }, { 0x0403bcd9, "Stellaris Evaluation Board" }, { 0x0403bcda, "Stellaris ICDI Board" }, + { 0x0403bd90, "PICAXE Download Cable [AXE027]" }, { 0x0403bdc8, "Egnite GmbH - JTAG/RS-232 adapter" }, { 0x0403bfd8, "OpenDCC" }, { 0x0403bfd9, "OpenDCC (Sniffer)" }, @@ -4186,6 +4188,7 @@ static const value_string usb_products_vals[] = { { 0x041100da, "WLI-U2-KG54L 802.11bg [ZyDAS ZD1211B]" }, { 0x041100db, "External Hard Drive HD-PF32OU2 [Buffalo Ministation]" }, { 0x041100e8, "WLI-UC-G300N Wireless LAN Adapter [Ralink RT2870]" }, + { 0x041100f9, "Portable DVD Writer (DVSM-PL58U2)" }, { 0x04110105, "External Hard Drive HD-CEU2 [Drive Station]" }, { 0x0411012c, "SATA Bridge" }, { 0x0411012e, "WLI-UC-AG300N Wireless LAN Adapter" }, @@ -4199,11 +4202,14 @@ static const value_string usb_products_vals[] = { { 0x0411019e, "WLI-UC-GNP Wireless LAN Adapter" }, { 0x041101a1, "MiniStation Metro" }, { 0x041101a2, "WLI-UC-GNM Wireless LAN Adapter [Ralink RT8070]" }, + { 0x041101ba, "SATA Bridge" }, { 0x041101dc, "Ultra-Slim Portable DVD Writer (DVSM-PC58U2V)" }, { 0x041101de, "External Hard Drive HD-PCTU3 [Buffalo MiniStation]" }, + { 0x041101ea, "SATA Bridge" }, { 0x041101ee, "WLI-UC-GNM2 Wireless LAN Adapter [Ralink RT3070]" }, { 0x041101f1, "SATA Adapter [HD-LBU3]" }, { 0x041101fd, "WLI-UC-G450 Wireless LAN Adapter" }, + { 0x0411027e, "HD-LCU3" }, { 0x04131310, "WinFast TV - NTSC + FM" }, { 0x04131311, "WinFast TV - NTSC + MTS + FM" }, { 0x04131312, "WinFast TV - PAL BG + FM" }, @@ -4302,6 +4308,7 @@ static const value_string usb_products_vals[] = { { 0x041e3121, "WoW tap chat" }, { 0x041e3220, "Sound Blaster Tactic(3D) Sigma sound card" }, { 0x041e3232, "Sound Blaster Premium HD [SBX]" }, + { 0x041e3237, "SB X-Fi Surround 5.1 Pro" }, { 0x041e3f00, "E-Mu Xboard 25 MIDI Controller" }, { 0x041e3f02, "E-Mu 0202" }, { 0x041e3f04, "E-Mu 0404" }, @@ -4928,6 +4935,7 @@ static const value_string usb_products_vals[] = { { 0x04518140, "TUSB8041 4-Port Hub" }, { 0x04518142, "TUSB8041 4-Port Hub" }, { 0x0451926b, "TUSB9260 Boot Loader" }, + { 0x0451bef3, "CC1352R1 Launchpad" }, { 0x0451dbc0, "Device Bay Controller" }, { 0x0451e001, "GraphLink [SilverLink]" }, { 0x0451e003, "TI-84 Plus Calculator" }, @@ -5362,6 +5370,7 @@ static const value_string usb_products_vals[] = { { 0x045e0797, "Optical Mouse 200" }, { 0x045e0799, "Surface Pro embedded keyboard" }, { 0x045e07a5, "Wireless Receiver 1461C" }, + { 0x045e07b2, "2.4GHz Transceiver v8.0 used by mouse Wireless Desktop 900" }, { 0x045e07b9, "Wired Keyboard 200" }, { 0x045e07c6, "RTL8153 GigE [Surface Dock Ethernet]" }, { 0x045e07ca, "Surface Pro 3 Docking Station Audio Device" }, @@ -5377,6 +5386,7 @@ static const value_string usb_products_vals[] = { { 0x045e090b, "Hub" }, { 0x045e090c, "SD Card" }, { 0x045e091a, "Hub" }, + { 0x045e09c0, "Surface Type Cover" }, { 0x045e0a00, "Lumia 950 Dual SIM (RM-1118)" }, { 0x045e930a, "ISOUSB.SYS Intel 82930 Isochronous IO Test Board" }, { 0x045effca, "Catalina" }, @@ -5442,6 +5452,8 @@ static const value_string usb_products_vals[] = { { 0x04614d62, "HP Laser Mobile Mini Mouse" }, { 0x04614d75, "Rocketfish RF-FLBTAD Bluetooth Adapter" }, { 0x04614d81, "Dell N889 Optical Mouse" }, + { 0x04614d91, "Laser mouse M-D16DL" }, + { 0x04614d92, "Optical mouse M-D17DR" }, { 0x04614de3, "HP 5-Button Optical Comfort Mouse" }, { 0x04614de7, "webcam" }, { 0x04614e04, "Lenovo Keyboard KB1021" }, @@ -5495,6 +5507,7 @@ static const value_string usb_products_vals[] = { { 0x046d080f, "Webcam C120" }, { 0x046d0810, "QuickCam Pro" }, { 0x046d0819, "Webcam C210" }, + { 0x046d081a, "Webcam C260" }, { 0x046d081b, "Webcam C310" }, { 0x046d081d, "HD Webcam C510" }, { 0x046d0820, "QuickCam VC" }, @@ -5559,7 +5572,7 @@ static const value_string usb_products_vals[] = { { 0x046d08d7, "QuickCam Communicate STX" }, { 0x046d08d8, "QuickCam for Notebook Deluxe" }, { 0x046d08d9, "QuickCam IM/Connect" }, - { 0x046d08da, "QuickCam Messenger" }, + { 0x046d08da, "QuickCam Messanger" }, { 0x046d08dd, "QuickCam for Notebooks" }, { 0x046d08e0, "QuickCam Express" }, { 0x046d08e1, "Labtec Webcam" }, @@ -5698,6 +5711,7 @@ static const value_string usb_products_vals[] = { { 0x046dc07d, "G502 Mouse" }, { 0x046dc07e, "G402 Gaming Mouse" }, { 0x046dc083, "G403 Prodigy Gaming Mouse" }, + { 0x046dc084, "G203 Gaming Mouse" }, { 0x046dc101, "UltraX Media Remote" }, { 0x046dc110, "Harmony 785/880/885 Remote" }, { 0x046dc111, "Harmony 525 Remote" }, @@ -5794,9 +5808,11 @@ static const value_string usb_products_vals[] = { { 0x046dc31c, "Keyboard K120" }, { 0x046dc31d, "Media Keyboard K200" }, { 0x046dc31f, "Comfort Keyboard K290" }, + { 0x046dc326, "Washable Keyboard K310" }, { 0x046dc328, "Corded Keyboard K280e" }, { 0x046dc332, "G502 Proteus Spectrum Optical Mouse" }, { 0x046dc335, "G910 Orion Spectrum Mechanical Keyboard" }, + { 0x046dc33a, "G413 Gaming Keyboard" }, { 0x046dc401, "TrackMan Marble Wheel" }, { 0x046dc402, "Marble Mouse (2-button)" }, { 0x046dc403, "Turbo TrackMan Marble FX" }, @@ -6129,6 +6145,7 @@ static const value_string usb_products_vals[] = { { 0x047f4254, "BUA-100 Bluetooth Adapter" }, { 0x047fac01, "Savi 7xx" }, { 0x047fad01, "GameCom 777 5.1 Headset" }, + { 0x047faf01, "DA80" }, { 0x047fc008, "Audio 655 DSP" }, { 0x047fc00e, "Blackwire C310 headset" }, { 0x04800001, "InTouch Module" }, @@ -6142,6 +6159,7 @@ static const value_string usb_products_vals[] = { { 0x0480a009, "Stor.E Basics" }, { 0x0480a00d, "STOR.E BASICS 500GB" }, { 0x0480a100, "Canvio Alu 2TB 2.5\" Black External Disk Model HDTH320EK3CA" }, + { 0x0480a102, "Canvio Alu 2TB 2.5\" Black External Disk Model HDTH320EK3CA" }, { 0x0480a202, "Canvio Basics HDD" }, { 0x0480a208, "Canvio Basics 2TB USB 3.0 Portable Hard Drive" }, { 0x0480b001, "Stor.E Partner" }, @@ -6166,6 +6184,8 @@ static const value_string usb_products_vals[] = { { 0x0482069b, "ECOSYS M2635dn" }, { 0x04830137, "BeWAN ADSL USB ST (blue or green)" }, { 0x04830138, "Unicorn II (ST70138B + MTC-20174TQ chipset)" }, + { 0x04830adb, "Android Debug Bridge (ADB) device" }, + { 0x04830afb, "Android Fastboot device" }, { 0x04831307, "Cytronix 6in1 Card Reader" }, { 0x0483163d, "Cool Icam Digi-MP3" }, { 0x04832015, "TouchChip\\xc2\\xae Fingerprint Reader" }, @@ -6177,13 +6197,18 @@ static const value_string usb_products_vals[] = { { 0x04833747, "ST Micro Connect Lite" }, { 0x04833748, "ST-LINK/V2" }, { 0x0483374b, "ST-LINK/V2.1" }, + { 0x0483374d, "STLINK-V3 Loader" }, + { 0x0483374e, "STLINK-V3" }, + { 0x0483374f, "STLINK-V3" }, + { 0x04833752, "ST-LINK/V2.1" }, + { 0x04833753, "STLINK-V3" }, { 0x04834810, "ISDN adapter" }, { 0x0483481d, "BT Digital Access adapter" }, { 0x04835000, "ST Micro/Ergenic ERG BT-002 Bluetooth Adapter" }, { 0x04835001, "ST Micro Bluetooth Device" }, { 0x04835710, "Joystick in FS Mode" }, { 0x04835720, "Mass Storage Device" }, - { 0x04835721, "Hantek DDS-3X25 Arbitrary Waveform Generator" }, + { 0x04835721, "Interrupt Demo" }, { 0x04835722, "Bulk Demo" }, { 0x04835730, "Audio Speaker" }, { 0x04835731, "Microphone" }, @@ -6647,6 +6672,7 @@ static const value_string usb_products_vals[] = { { 0x04a91787, "PIXMA MX490 Series" }, { 0x04a9178a, "PIXMA MG3600 Series" }, { 0x04a9178d, "PIXMA MG6853" }, + { 0x04a9180b, "PIXMA MG3000 series" }, { 0x04a91900, "CanoScan LiDE 90" }, { 0x04a91901, "CanoScan 8800F" }, { 0x04a91904, "CanoScan LiDE 100" }, @@ -6778,6 +6804,7 @@ static const value_string usb_products_vals[] = { { 0x04a926b0, "MF4600 series" }, { 0x04a926b4, "MF4010 series" }, { 0x04a926b5, "MF4200 series" }, + { 0x04a926b6, "FAX-L140/L130" }, { 0x04a926da, "LBP3010B printer" }, { 0x04a926e6, "iR1024" }, { 0x04a9271a, "LBP6000" }, @@ -7094,7 +7121,10 @@ static const value_string usb_products_vals[] = { { 0x04a9329c, "PowerShot SX400 IS" }, { 0x04a9329d, "PowerShot G7 X" }, { 0x04a9329f, "PowerShot SX530 HS" }, + { 0x04a932a0, "EOS M10" }, { 0x04a932a6, "PowerShot SX710 HS" }, + { 0x04a932a7, "PowerShot SX610 HS" }, + { 0x04a932a8, "PowerShot G3 X" }, { 0x04a932aa, "Powershot ELPH 160 / IXUS 160" }, { 0x04a932ab, "PowerShot ELPH 350HS / IXUS 275 HS" }, { 0x04a932ac, "PowerShot ELPH 170 IS / IXUS 170" }, @@ -7106,6 +7136,11 @@ static const value_string usb_products_vals[] = { { 0x04a932bf, "PowerShot SX420 IS" }, { 0x04a932c1, "PowerShot ELPH 180 / IXUS 175" }, { 0x04a932c2, "PowerShot SX720 HS" }, + { 0x04a932c5, "EOS M6" }, + { 0x04a932cc, "EOS 200D" }, + { 0x04a932d1, "EOS M100" }, + { 0x04a932d2, "EOS M50" }, + { 0x04a932d4, "Powershot ELPH 185 / IXUS 185 / IXY 200" }, { 0x04a932d5, "PowerShot SX430 IS" }, { 0x04a932db, "SELPHY CP1300" }, { 0x04ad2501, "Bluetooth Device" }, @@ -7604,6 +7639,7 @@ static const value_string usb_products_vals[] = { { 0x04c510e1, "fi-5220C" }, { 0x04c510e7, "fi-5900C" }, { 0x04c510fe, "S500" }, + { 0x04c51104, "KD02906 Line Thermal Printer" }, { 0x04c51140, "FOMA F903iX HIGH-SPEED" }, { 0x04c51150, "fi-6230" }, { 0x04c5125a, "PalmSecure Sensor Device - MP" }, @@ -7793,6 +7829,7 @@ static const value_string usb_products_vals[] = { { 0x04d89004, "Microchip REAL ICE" }, { 0x04d8900a, "PICkit3" }, { 0x04d89012, "PICkit4" }, + { 0x04d89015, "ICD 4 In-Circuit Debugger" }, { 0x04d8c001, "PicoLCD 20x4" }, { 0x04d8e11c, "TL866CS EEPROM Programmer [MiniPRO]" }, { 0x04d8f2c4, "Macareux-labs Hygrometry Temperature Sensor" }, @@ -7800,6 +7837,7 @@ static const value_string usb_products_vals[] = { { 0x04d8f3aa, "Macareux-labs Usbce Bootloader mode" }, { 0x04d8f437, "SBE Tech Ultrasonic Anemometer" }, { 0x04d8f4b5, "SmartScope" }, + { 0x04d8f5fe, "TrueRNG" }, { 0x04d8f8da, "Hughski Ltd. ColorHug" }, { 0x04d8f8e8, "Harmony 300/350 Remote" }, { 0x04d8f91c, "SPROG IIv3" }, @@ -7830,6 +7868,7 @@ static const value_string usb_products_vals[] = { { 0x04d92519, "Shenzhen LogoTech 2.4GHz receiver" }, { 0x04d92832, "HT82A832R Audio MCU" }, { 0x04d92834, "HT82A834R Audio MCU" }, + { 0x04d94545, "Keyboard [Diatec Majestouch 2 Tenkeyless]" }, { 0x04d9a01c, "wireless multimedia keyboard with trackball [Trust ADURA 17911]" }, { 0x04d9a050, "Chatman V1" }, { 0x04d9a052, "USB-zyTemp" }, @@ -7848,6 +7887,7 @@ static const value_string usb_products_vals[] = { { 0x04da0d0a, "CD-R Drive KXL-CB20AN" }, { 0x04da0d0d, "CDRCB03" }, { 0x04da0d0e, "DVD-ROM & CD-R/RW" }, + { 0x04da0d14, "DVD-RAM MLT08" }, { 0x04da0f07, "KX-MB2030 Multifunction Laser Printer" }, { 0x04da0f40, "Printer" }, { 0x04da104d, "Elite Panaboard UB-T880 (HID)" }, @@ -8234,8 +8274,8 @@ 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, "Galaxy (MTP)" }, - { 0x04e86863, "GT-I9500 [Galaxy S4] / GT-I9250 [Galaxy Nexus] (network tethering)" }, + { 0x04e86860, "Galaxy series, misc. (MTP mode)" }, + { 0x04e86863, "Galaxy series, misc. (tethering mode)" }, { 0x04e86864, "GT-I9070 (network tethering, USB debugging enabled)" }, { 0x04e86865, "Galaxy (PTP mode)" }, { 0x04e86866, "Galaxy (debugging mode)" }, @@ -8370,8 +8410,10 @@ static const value_string usb_products_vals[] = { { 0x04f2b3fd, "HD WebCam (Asus N-series)" }, { 0x04f2b40e, "HP Truevision HD camera" }, { 0x04f2b444, "Lenovo Integrated Webcam" }, + { 0x04f2b563, "Integrated Camera" }, { 0x04f2b5ce, "Integrated Camera" }, { 0x04f2b5cf, "Integrated IR Camera" }, + { 0x04f2b5db, "HP Webcam" }, { 0x04f3000a, "Touchscreen" }, { 0x04f30103, "ActiveJet K-2024 Multimedia Keyboard" }, { 0x04f3016f, "Touchscreen" }, @@ -8935,6 +8977,7 @@ static const value_string usb_products_vals[] = { { 0x04fc757a, "Aiptek, MP315 MP3 Player" }, { 0x04fcffff, "PureDigital Ritz Disposable" }, { 0x04fd0003, "Smart Card Reader II" }, + { 0x04fe0006, "Happy Hacking Keyboard Lite2" }, { 0x05000001, "DART Keyboard Mouse" }, { 0x05000002, "DART-2 Keyboard" }, { 0x05020001, "Handheld" }, @@ -9019,6 +9062,7 @@ static const value_string usb_products_vals[] = { { 0x050d0257, "F5U257 Serial" }, { 0x050d0304, "FSU304 USB 2.0 - 4 Ports Hub" }, { 0x050d0307, "USB 2.0 - 7 ports Hub [FSU307]" }, + { 0x050d038c, "F2CU038 HDMI Adapter" }, { 0x050d0409, "F5U409 Serial" }, { 0x050d0416, "Staples 12416 7 port desktop hub" }, { 0x050d0551, "F6C550-AVR UPS" }, @@ -9429,6 +9473,7 @@ static const value_string usb_products_vals[] = { { 0x054c07c4, "ILCE-6000 (aka Alpha-6000) in Mass Storage mode" }, { 0x054c082f, "Walkman NWZW Series" }, { 0x054c0847, "WG-C10 Portable Wireless Server" }, + { 0x054c0884, "MDR-ZX770BN [Wireless Noise Canceling Stereo Headset]" }, { 0x054c088c, "Portable Headphone Amplifier" }, { 0x054c08b7, "ILCE-6000 (aka Alpha-6000) in MTP mode" }, { 0x054c094e, "ILCE-6000 (aka Alpha-6000) in PC Remote mode" }, @@ -9567,7 +9612,9 @@ static const value_string usb_products_vals[] = { { 0x05662802, "Kbd Hub" }, { 0x05663002, "Keyboard" }, { 0x05663004, "Genius KB-29E" }, + { 0x05663027, "Sun-Flex ProTouch" }, { 0x05663107, "Keyboard" }, + { 0x05663132, "Optical mouse M-DY4DR / M-DY6DR" }, { 0x05664006, "FID 638 Mouse (Sun Microsystems)" }, { 0x056a0000, "PenPartner" }, { 0x056a0001, "PenPartner 4x5" }, @@ -9744,18 +9791,20 @@ static const value_string usb_products_vals[] = { { 0x056d0002, "HID Monitor Controls" }, { 0x056d0003, "Device Bay Controller" }, { 0x056e0002, "29UO Mouse" }, - { 0x056e0057, "M-PGDL Mouse" }, - { 0x056e005c, "M-PGDL Mouse" }, - { 0x056e005d, "M-FGDL Mouse" }, - { 0x056e005e, "M-FG2DL Mouse" }, - { 0x056e0062, "M-D18DR Mouse" }, - { 0x056e0063, "M-SODL Mouse" }, - { 0x056e0069, "M-GE1UL Mouse" }, - { 0x056e0071, "M-GE3DL Mouse" }, - { 0x056e0072, "M-LS6UL Mouse" }, - { 0x056e0073, "M-LS7UL Mouse" }, - { 0x056e0074, "M-FW1UL Mouse" }, + { 0x056e0057, "Micro Grast Pop M-PGDL" }, + { 0x056e005c, "Micro Grast Pop M-PG2DL" }, + { 0x056e005d, "Micro Grast Fit M-FGDL" }, + { 0x056e005e, "Micro Grast Fit M-FG2DL" }, + { 0x056e0062, "Optical mouse M-D18DR" }, + { 0x056e0063, "Laser mouse M-SODL" }, + { 0x056e0069, "Laser mouse M-GE1UL" }, + { 0x056e0071, "Laser mouse M-GE3DL" }, + { 0x056e0072, "Laser mouse M-LS6UL" }, + { 0x056e0073, "Laser mouse M-LS7UL" }, + { 0x056e0074, "Optical mouse M-FW1UL" }, { 0x056e0075, "M-FW2DL Mouse" }, + { 0x056e2003, "JC-U3613M" }, + { 0x056e2004, "JC-U3613M" }, { 0x056e200c, "LD-USB/TX" }, { 0x056e4002, "Laneed 100Mbps Ethernet LD-USB/TX [pegasus]" }, { 0x056e4005, "LD-USBL/TX" }, @@ -16689,7 +16738,7 @@ static const value_string usb_products_vals[] = { { 0x12091006, "Mini IO-Board" }, { 0x12091ab5, "Arachnid Labs Tsunami" }, { 0x12092000, "Zygmunt Krynicki Lantern Brightness Sensor" }, - { 0x12092048, "Housedillon.com MRF49XA Transceiver" }, + { 0x12092048, "Housedillon.com MRF49XA Transciever" }, { 0x12092222, "LabConnect Signalgenerator" }, { 0x12092300, "Keyboardio Keyboardio Model 01 Bootloader" }, { 0x12092301, "Keyboardio Keyboardio Model 01" }, @@ -18976,10 +19025,10 @@ static const value_string usb_products_vals[] = { { 0x1d5060e9, "keyman64 keyboard itercepter" }, { 0x1d5060ea, "Wiggleport FPGA-based I/O board" }, { 0x1d5060ec, "Duet 3D Printer Controller" }, - { 0x1d5060f0, "UDAD-T1 data acquisition device (boot)" }, - { 0x1d5060f1, "UDAD-T1 data acquisition device" }, - { 0x1d5060f2, "UDAD-T2 data acquisition device (boot)" }, - { 0x1d5060f3, "UDAD-T2 data acquisition device" }, + { 0x1d5060f0, "UDAD-T1 data aquisition device (boot)" }, + { 0x1d5060f1, "UDAD-T1 data aquisition device" }, + { 0x1d5060f2, "UDAD-T2 data aquisition device (boot)" }, + { 0x1d5060f3, "UDAD-T2 data aquisition device" }, { 0x1d5060f4, "Uniti ARC motor controller" }, { 0x1d5060f5, "EightByEight Blinky Badge (DFU)" }, { 0x1d5060f6, "EightByEight Blinky Badge" }, @@ -19096,7 +19145,7 @@ static const value_string usb_products_vals[] = { { 0x1f870002, "Multi-touch HID Controller" }, { 0x1f9b0241, "AirView2-EXT" }, { 0x1fab104d, "ES65" }, - { 0x1fbd0001, "Expert Key - Data acquisition system" }, + { 0x1fbd0001, "Expert Key - Data aquisition system" }, { 0x1fc90003, "LPC1343" }, { 0x1fc9010b, "PR533" }, { 0x1fc9012b, "i.MX 8M Dual/8M QuadLite/8M Quad Serial Downloader" }, |