diff options
Diffstat (limited to 'epan/dissectors/usb.c')
-rw-r--r-- | epan/dissectors/usb.c | 82 |
1 files changed, 74 insertions, 8 deletions
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c index abfa4fe1ce..96008084c0 100644 --- a/epan/dissectors/usb.c +++ b/epan/dissectors/usb.c @@ -1456,6 +1456,7 @@ static const value_string usb_vendors_vals[] = { { 0x0bf7, "Sunny Giken, Inc." }, { 0x0bf8, "Fujitsu Siemens Computers" }, { 0x0bfd, "Kvaser AB" }, + { 0x0c00, "FireFly Mouse Mat" }, { 0x0c04, "MOTO Development Group, Inc." }, { 0x0c05, "Appian Graphics" }, { 0x0c06, "Hasbro Games, Inc." }, @@ -1573,6 +1574,7 @@ static const value_string usb_vendors_vals[] = { { 0x0ccd, "TerraTec Electronic GmbH" }, { 0x0cd4, "Bang Olufsen" }, { 0x0cd5, "LabJack Corporation" }, + { 0x0cd6, "Scheidt & Bachmann" }, { 0x0cd7, "NewChip S.r.l." }, { 0x0cd8, "JS Digitech, Inc." }, { 0x0cd9, "Hitachi Shin Din Cable, Ltd" }, @@ -2781,6 +2783,7 @@ static const value_string usb_vendors_vals[] = { { 0x1d5b, "Smartronix, Inc." }, { 0x1d6b, "Linux Foundation" }, { 0x1d90, "Citizen" }, + { 0x1d9d, "Sigma Sport" }, { 0x1de1, "Actions Microelectronics Co." }, { 0x1e0e, "Qualcomm / Option" }, { 0x1e10, "Point Grey Research, Inc." }, @@ -3024,6 +3027,7 @@ static const value_string usb_products_vals[] = { { 0x00790011, "Gamepad" }, { 0x0105145f, "NW-3100 802.11b/g 54Mbps Wireless Network Adapter [zd1211]" }, { 0x01270002, "HDM Interface" }, + { 0x01270127, "ibp" }, { 0x01450112, "Card Reader" }, { 0x017c145f, "Trust Deskset" }, { 0x02000201, "MA180 UMTS Modem" }, @@ -3622,6 +3626,7 @@ static const value_string usb_products_vals[] = { { 0x03f08c11, "Deskjet F4500 series" }, { 0x03f09002, "PhotoSmart M437" }, { 0x03f09102, "PhotoSmart M537" }, + { 0x03f09207, "HD-4110 Webcam" }, { 0x03f09302, "PhotoSmart R930 series" }, { 0x03f09402, "PhotoSmart R837" }, { 0x03f09502, "PhotoSmart R840 series" }, @@ -4800,6 +4805,8 @@ static const value_string usb_products_vals[] = { { 0x044e3017, "BCM2046 Bluetooth Device" }, { 0x044effff, "Compaq Bluetooth Multiport Module" }, { 0x044f0400, "HOTAS Cougar" }, + { 0x044f0402, "HOTAS Warthog Joystick" }, + { 0x044f0404, "HOTAS Warthog Throttle" }, { 0x044f044f, "GP XID" }, { 0x044fa003, "Rage 3D Game Pad" }, { 0x044fa01b, "PK-GP301 Driving Wheel" }, @@ -5109,6 +5116,7 @@ static const value_string usb_products_vals[] = { { 0x045e02d1, "Xbox One Controller" }, { 0x045e02d5, "Xbox One Digital TV Tuner" }, { 0x045e02dd, "Xbox One Controller (Covert Forces/Firmware 2015)" }, + { 0x045e02e6, "Wireless XBox Controller Dongle" }, { 0x045e0400, "Windows Powered Pocket PC 2002" }, { 0x045e0401, "Windows Powered Pocket PC 2002" }, { 0x045e0402, "Windows Powered Pocket PC 2002" }, @@ -5260,6 +5268,7 @@ static const value_string usb_products_vals[] = { { 0x045e0750, "Wired Keyboard 600" }, { 0x045e0752, "Wired Keyboard 400" }, { 0x045e075d, "LifeCam Cinema" }, + { 0x045e0761, "LifeCam VX-2000" }, { 0x045e0766, "LifeCam VX-800" }, { 0x045e0768, "Sidewinder X4" }, { 0x045e076c, "Comfort Mouse 4500" }, @@ -5358,6 +5367,8 @@ static const value_string usb_products_vals[] = { { 0x046a0081, "eHealth Keyboard G87 1504" }, { 0x046a0106, "R-300 Wireless Mouse Receiver" }, { 0x046a010d, "MX-Board 3.0 Keyboard" }, + { 0x046ab090, "Keyboard" }, + { 0x046ab091, "Mouse" }, { 0x046b0001, "Keyboard" }, { 0x046b0101, "PS/2 Keyboard, Mouse & Joystick Ports" }, { 0x046b0301, "USB 1.0 Hub" }, @@ -5600,7 +5611,7 @@ static const value_string usb_products_vals[] = { { 0x046dc20c, "WingMan Precision" }, { 0x046dc20d, "WingMan Attack 2" }, { 0x046dc20e, "WingMan Formula GP" }, - { 0x046dc211, "iTouch Cordless Reciever" }, + { 0x046dc211, "iTouch Cordless Receiver" }, { 0x046dc212, "WingMan Extreme Digital 3D" }, { 0x046dc213, "J-UH16 (Freedom 2.4 Cordless Joystick)" }, { 0x046dc214, "ATK3 (Attack III Joystick)" }, @@ -6016,6 +6027,7 @@ static const value_string usb_products_vals[] = { { 0x0480a202, "Canvio Basics HDD" }, { 0x0480a208, "Canvio Basics 2TB USB 3.0 Portable Hard Drive" }, { 0x0480b001, "Stor.E Partner" }, + { 0x0480b207, "Canvio Ready" }, { 0x0480d000, "External Disk 2TB Model DT01ABA200" }, { 0x0480d010, "External Disk 3TB" }, { 0x0480d011, "Canvio Desk" }, @@ -6076,6 +6088,7 @@ static const value_string usb_products_vals[] = { { 0x0489e042, "Broadcom BCM20702 Bluetooth" }, { 0x0489e04d, "Atheros AR3012 Bluetooth" }, { 0x048d1165, "IT1165 Flash Controller" }, + { 0x048d1172, "Flash Drive" }, { 0x048d1336, "SD/MMC Cardreader" }, { 0x048d1345, "Multi Cardreader" }, { 0x048d9006, "IT9135 BDA Afatech DVB-T HDTV Dongle" }, @@ -6384,9 +6397,11 @@ static const value_string usb_products_vals[] = { { 0x04a910a8, "iP6220D" }, { 0x04a910a9, "iP6600D" }, { 0x04a910b6, "PIXMA iP4300 Printer" }, + { 0x04a910b7, "PIXMA iP5300 Printer" }, { 0x04a910c2, "PIXMA iP1800 Printer" }, { 0x04a910c4, "Pixma iP4500 Printer" }, - { 0x04a910c9, "PIXIMA iP4600 Printer" }, + { 0x04a910c9, "PIXMA iP4600 Printer" }, + { 0x04a910ca, "PIXMA iP3600 Printer" }, { 0x04a910e3, "PIXMA iX6850 Printer" }, { 0x04a91404, "W6400PG" }, { 0x04a91405, "W8400PG" }, @@ -6425,7 +6440,7 @@ static const value_string usb_products_vals[] = { { 0x04a91725, "MP610 ser" }, { 0x04a91726, "MP970 ser" }, { 0x04a91727, "MX300 ser" }, - { 0x04a91728, "MX310 ser" }, + { 0x04a91728, "PIXMA MX310 series" }, { 0x04a91729, "MX700 ser" }, { 0x04a9172b, "MP140 ser" }, { 0x04a91736, "PIXMA MX320 series" }, @@ -6850,6 +6865,7 @@ static const value_string usb_products_vals[] = { { 0x04a93276, "PowerShot SX170 IS" }, { 0x04a93277, "PowerShot SX510 HS" }, { 0x04a93278, "PowerShot S200" }, + { 0x04a9327a, "SELPHY CP910" }, { 0x04a9327d, "Powershot ELPH 115 IS / IXUS 132" }, { 0x04a9327f, "EOS Rebel T5 / EOS 1200D / EOS Kiss X70" }, { 0x04a93284, "PowerShot D30" }, @@ -6870,6 +6886,7 @@ static const value_string usb_products_vals[] = { { 0x04a932aa, "Powershot ELPH 160 / IXUS 160" }, { 0x04a932ac, "PowerShot ELPH 170 IS / IXUS 170" }, { 0x04a932ad, "PowerShot SX410 IS" }, + { 0x04a932b1, "SELPHY CP1200" }, { 0x04a932c1, "PowerShot ELPH 180 / IXUS 175" }, { 0x04ad2501, "Bluetooth Device" }, { 0x04b00102, "Coolpix 990" }, @@ -9040,6 +9057,7 @@ static const value_string usb_products_vals[] = { { 0x054c021b, "Net MD" }, { 0x054c021c, "Hi-MD WALKMAN" }, { 0x054c021d, "Net MD" }, + { 0x054c0226, "UP-CR10L" }, { 0x054c0227, "Printing Support" }, { 0x054c022c, "Net MD" }, { 0x054c022d, "Hi-MD AUDIO" }, @@ -9391,6 +9409,12 @@ static const value_string usb_products_vals[] = { { 0x056a0317, "PTH-851 [Intuos pro (L)]" }, { 0x056a0318, "CTH-301 [Bamboo]" }, { 0x056a032f, "DTU-1031X" }, + { 0x056a0347, "Integrated Hub" }, + { 0x056a0348, "Integrated Hub" }, + { 0x056a034a, "DTH-W1320 [MobileStudio Pro 13] touchscreen" }, + { 0x056a034b, "DTH-W1620 [MobileStudio Pro 16] touchscreen" }, + { 0x056a034d, "DTH-W1320 [MobileStudio Pro 13] tablet" }, + { 0x056a034e, "DTH-W1620 [MobileStudio Pro 16] tablet" }, { 0x056a0400, "PenPartner 4x5" }, { 0x056a4001, "TPC4001" }, { 0x056a4004, "TPC4004" }, @@ -11355,7 +11379,12 @@ static const value_string usb_products_vals[] = { { 0x06d30394, "CP9000D/DW Port" }, { 0x06d303a1, "CP9550D/DW Port" }, { 0x06d303a5, "CP9550DW-S" }, + { 0x06d303a9, "CP-9600DW" }, + { 0x06d303aa, "CP3020DA" }, + { 0x06d303ad, "CP-9800DW-S" }, + { 0x06d303ae, "CP-9800DW-S" }, { 0x06d321ba, "FOMA D905i" }, + { 0x06d33b10, "P95D" }, { 0x06d33b30, "CP-D70DW / CP-D707DW" }, { 0x06d33b31, "CP-K60DW-S" }, { 0x06d54000, "Japanese Keyboard" }, @@ -11551,6 +11580,7 @@ static const value_string usb_products_vals[] = { { 0x07180622, "TDK Trans-It 4GB" }, { 0x07180624, "TDK Trans-It 16GB" }, { 0x07181120, "RDX External dock (redbud)" }, + { 0x07184006, "8x Slim DVD Multi-Format Recorder External" }, { 0x0718d000, "Disc Stakka CD/DVD Manager" }, { 0x071b0002, "DTI-56362-USB Digital Interface Unit" }, { 0x071b0101, "Audio4-USB DSP Data Acquisition Unit" }, @@ -11821,10 +11851,12 @@ static const value_string usb_products_vals[] = { { 0x07815571, "Cruzer Fit" }, { 0x07815575, "Cruzer Glide" }, { 0x07815576, "Cruzer Facet" }, + { 0x07815577, "Cruzer Pop (8GB)" }, { 0x0781557d, "Cruzer Force (64GB)" }, { 0x07815580, "SDCZ80 Flash Drive" }, { 0x07815581, "Ultra" }, { 0x07815583, "Ultra Fit" }, + { 0x07815590, "Ultra Dual" }, { 0x07815591, "Ultra Flair" }, { 0x07815e10, "Encrypted" }, { 0x07816100, "Ultra II SD Plus 2GB" }, @@ -12655,14 +12687,21 @@ static const value_string usb_products_vals[] = { { 0x08b0001a, "852 Titrando" }, { 0x08b70001, "Playstation adapter" }, { 0x08b801f4, "USBSIMM1" }, - { 0x08bb2702, "Speakers" }, - { 0x08bb2704, "Audio Codec" }, - { 0x08bb2706, "PCM2706 Audio Codec" }, + { 0x08bb2702, "PCM2702 16-bit stereo audio DAC" }, + { 0x08bb2704, "PCM2704 16-bit stereo audio DAC" }, + { 0x08bb2705, "PCM2705 stereo audio DAC" }, + { 0x08bb2706, "PCM2706 stereo audio DAC" }, + { 0x08bb2707, "PCM2707 stereo audio DAC" }, + { 0x08bb27c4, "PCM2704C stereo audio DAC" }, + { 0x08bb27c5, "PCM2705C stereo audio DAC" }, + { 0x08bb27c6, "PCM2706C stereo audio DAC" }, + { 0x08bb27c7, "PCM2707C stereo audio DAC" }, { 0x08bb2900, "PCM2900 Audio Codec" }, { 0x08bb2901, "PCM2901 Audio Codec" }, { 0x08bb2902, "PCM2902 Audio Codec" }, { 0x08bb2904, "PCM2904 Audio Codec" }, { 0x08bb2910, "PCM2912 Audio Codec" }, + { 0x08bb2912, "PCM2912A Audio Codec" }, { 0x08bb29b0, "PCM2900B Audio CODEC" }, { 0x08bb29b2, "PCM2902 Audio CODEC" }, { 0x08bb29b3, "PCM2903B Audio CODEC" }, @@ -12976,6 +13015,7 @@ static const value_string usb_products_vals[] = { { 0x091e253c, "GPSmap 62sc" }, { 0x091e255b, "Nuvi 2505LM" }, { 0x091e26a1, "Nuvi 55" }, + { 0x091e47fb, "nuviCam" }, { 0x09207500, "Network Interface" }, { 0x09211001, "GoCOM232 Serial" }, { 0x09220007, "LabelWriter 330" }, @@ -12989,6 +13029,7 @@ static const value_string usb_products_vals[] = { { 0x092423dd, "DocuPrint M760 (X760_USB)" }, { 0x09243ce8, "Phaser 3428 Printer" }, { 0x09243cea, "Phaser 3125" }, + { 0x09243cec, "Phaser 3250" }, { 0x09243d5b, "Phaser 6115MFP TWAIN Scanner" }, { 0x09243d6d, "WorkCentre 6015N/NI" }, { 0x0924420f, "WorkCentre PE220 Series" }, @@ -13191,6 +13232,7 @@ static const value_string usb_products_vals[] = { { 0x09511689, "DataTraveler SE9" }, { 0x0951168a, "DataTraveler Micro" }, { 0x0951168c, "DT Elite 3.0" }, + { 0x09557018, "APX" }, { 0x09557030, "Tegra 3 (recovery mode)" }, { 0x095570a9, "nVidia CM9-Adam" }, { 0x09557100, "Tegra Device" }, @@ -13813,9 +13855,15 @@ 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" }, + { 0x0b05550f, "Fonepad 7" }, { 0x0b056101, "Cable Modem" }, { 0x0b05620a, "Remote NDIS Device" }, + { 0x0b057772, "ASUS Zenfone GO (ZB500KL) (MTP mode)" }, + { 0x0b057773, "ASUS Zenfone GO (ZB500KL) (Debug, MTP mode)" }, + { 0x0b057774, "ASUS Zenfone GO (ZB500KL) (RNDIS mode)" }, + { 0x0b057775, "ASUS Zenfone GO (ZB500KL) (Debug, RNDIS mode)" }, + { 0x0b057776, "ASUS Zenfone GO (ZB500KL) (PTP mode)" }, + { 0x0b057777, "ASUS Zenfone GO (ZB500KL) (Debug, PTP mode)" }, { 0x0b05b700, "Broadcom Bluetooth 2.1" }, { 0x0b0b106e, "Datamax E-4304" }, { 0x0b0c0009, "Todos Argos Mini II Smart Card Reader" }, @@ -14170,6 +14218,7 @@ static const value_string usb_products_vals[] = { { 0x0bc2231a, "Expansion Portable" }, { 0x0bc22320, "USB 3.0 bridge [Portable Expansion Drive]" }, { 0x0bc22321, "Expansion Portable" }, + { 0x0bc22322, "SRD0NF1 Expansion Portable (STEA)" }, { 0x0bc22340, "FreeAgent External Hard Drive" }, { 0x0bc23000, "FreeAgent Desktop" }, { 0x0bc23008, "FreeAgent Desk 1TB" }, @@ -14188,6 +14237,7 @@ static const value_string usb_products_vals[] = { { 0x0bc250a5, "FreeAgent GoFlex Desk USB 3.0" }, { 0x0bc25121, "FreeAgent GoFlex" }, { 0x0bc25161, "FreeAgent GoFlex dock" }, + { 0x0bc261b7, "Maxtor M3 Portable" }, { 0x0bc2a003, "Backup Plus" }, { 0x0bc2a0a1, "Backup Plus Desktop" }, { 0x0bc2a0a4, "Backup Plus Desktop Drive" }, @@ -14197,6 +14247,7 @@ static const value_string usb_products_vals[] = { { 0x0bc2ab24, "Backup Plus Portable Drive" }, { 0x0bc2ab31, "Backup Plus Desktop Drive (5TB)" }, { 0x0bc2ab34, "Backup Plus" }, + { 0x0bc2ab38, "Backup Plus Hub" }, { 0x0bc30001, "UMTS-TDD (TD-CDMA) modem" }, { 0x0bc70001, "ActiveHome (ACPI-compliant)" }, { 0x0bc70002, "Firecracker Interface (ACPI-compliant)" }, @@ -14255,6 +14306,7 @@ static const value_string usb_products_vals[] = { { 0x0bda5401, "RTL 8153 USB 3.0 hub with gigabit ethernet" }, { 0x0bda570c, "Asus laptop camera" }, { 0x0bda5730, "HP 2.0MP High Definition Webcam" }, + { 0x0bda5751, "Integrated Webcam" }, { 0x0bda5775, "HP \"Truevision HD\" laptop camera" }, { 0x0bda57b3, "Acer 640 \\xc3\\x97 480 laptop camera" }, { 0x0bda57da, "Built-In Video Camera" }, @@ -14311,6 +14363,7 @@ static const value_string usb_products_vals[] = { { 0x0bfd0004, "USBcan II" }, { 0x0bfd000b, "Leaf Light HS" }, { 0x0bfd000e, "Leaf SemiPro HS" }, + { 0x0c001607, "Apex M500" }, { 0x0c080378, "Q 16MB Storage Device" }, { 0x0c09a5a5, "Litto Version USB2.0" }, { 0x0c0b27cb, "6-in-1 Flash Reader and Writer" }, @@ -14508,6 +14561,7 @@ static const value_string usb_products_vals[] = { { 0x0c456480, "Sonix 1.3 MP Laptop Integrated Webcam" }, { 0x0c45648b, "Integrated Webcam" }, { 0x0c4564bd, "Sony Visual Communication Camera" }, + { 0x0c4564d0, "Integrated Webcam" }, { 0x0c4564d2, "Integrated Webcam" }, { 0x0c45651b, "HP Webcam" }, { 0x0c456705, "Integrated HD Webcam" }, @@ -14630,7 +14684,9 @@ static const value_string usb_products_vals[] = { { 0x0ca6107e, "Reader Controller" }, { 0x0ca62010, "myPad110 PC/SC Smart Card Reader" }, { 0x0ca63050, "EZ710 Smart Card Reader" }, - { 0x0cad1030, "APX Series Radio" }, + { 0x0cad1007, "APX Series Consolette" }, + { 0x0cad1030, "APX Series Radio (Portable)" }, + { 0x0cad1031, "APX Series Radio (Mobile)" }, { 0x0cad1602, "IMPRES Battery Data Reader" }, { 0x0cad9001, "PowerPad Pocket PC\\xc2\\xa0Device" }, { 0x0caf2507, "Hi-Speed USB-to-IDE Bridge Controller" }, @@ -14686,6 +14742,9 @@ static const value_string usb_products_vals[] = { { 0x0cd40101, "BeolinkPC2" }, { 0x0cd50003, "U3" }, { 0x0cd50009, "UE9" }, + { 0x0cd6000c, "S&B TPU" }, + { 0x0cd6000e, "S&B BKV" }, + { 0x0cd60011, "Money Coin Unit" }, { 0x0cd82007, "Smart Card Reader/JSTU-9700" }, { 0x0cde0001, "XI-750 802.11b Wireless Adapter [Atmel AT76C503A]" }, { 0x0cde0002, "XI-725/726 Prism2.5 802.11b Adapter" }, @@ -14766,6 +14825,7 @@ static const value_string usb_products_vals[] = { { 0x0d160001, "PhotoShuttle" }, { 0x0d160002, "Photo Printer 730 series" }, { 0x0d160004, "Photo Printer 63xPL/PS" }, + { 0x0d16000e, "P910L" }, { 0x0d160100, "Photo Printer 63xPL/PS" }, { 0x0d160102, "Photo Printer 64xPS" }, { 0x0d160103, "Photo Printer 730 series" }, @@ -15101,6 +15161,7 @@ static const value_string usb_products_vals[] = { { 0x0df71800, "Generic Card Reader" }, { 0x0df71802, "Card Reader" }, { 0x0dfc0001, "Touchscreen" }, + { 0x0dfc0101, "5-point Touch Screen" }, { 0x0e0b9031, "802.11n Wireless USB Card" }, { 0x0e0b9041, "802.11n Wireless USB Card" }, { 0x0e0c0101, "LonUSB LonTalk Network Adapter" }, @@ -15386,6 +15447,7 @@ static const value_string usb_products_vals[] = { { 0x0fca8010, "Blackberry Playbook (Connect to Windows mode)" }, { 0x0fca8011, "Blackberry Playbook (Connect to Mac mode)" }, { 0x0fca8020, "Blackberry Playbook (CD-Rom mode)" }, + { 0x0fca8037, "Blackberry PRIV" }, { 0x0fce0075, "SonyEricsson K850i" }, { 0x0fce0076, "SonyEricsson W910" }, { 0x0fce00af, "V640i Phone [PTP Camera]" }, @@ -15622,6 +15684,7 @@ static const value_string usb_products_vals[] = { { 0x1004631d, "Optimus Android Phone (Camera/PTP Mode)" }, { 0x1004631e, "G2/Optimus Android Phone [Camera/PTP mode]" }, { 0x1004631f, "Optimus Android Phone (Charge Mode)" }, + { 0x1004633a, "Ultimate 2 Android Phone L41C" }, { 0x1004633e, "G2/G3 Android Phone [MTP/PTP/Download mode]" }, { 0x10046344, "G2 Android Phone [tethering mode]" }, { 0x10046356, "Optimus Android Phone [Virtual CD mode]" }, @@ -15790,6 +15853,7 @@ static const value_string usb_products_vals[] = { { 0x10581140, "My Book Essential (WDBACW)" }, { 0x10581230, "My Book (WDBFJK)" }, { 0x10581235, "My Book (WDBFJK0040HBK)" }, + { 0x10582599, "My Passport Ultra (WD40NMZW)" }, { 0x1058259d, "My Passport Ultra (WDBBKD)" }, { 0x1058259f, "My Passport Ultra (WD10JMVW)" }, { 0x1059000b, "StarSign Bio Token 3.0" }, @@ -18287,6 +18351,8 @@ static const value_string usb_products_vals[] = { { 0x1d6b0105, "FunctionFS Gadget" }, { 0x1d6b0200, "Qemu Audio Device" }, { 0x1d90201e, "PPU-700" }, + { 0x1d9d1010, "Docking Station Topline 2009" }, + { 0x1d9d1011, "Docking Station Topline 2012" }, { 0x1de11101, "Generic Display Device (Mass storage mode)" }, { 0x1de1c101, "Generic Display Device" }, { 0x1e0ef000, "iCON 210 UMTS Surfstick" }, |