diff options
author | Gerald Combs <gerald@wireshark.org> | 2019-10-06 08:20:09 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2019-10-06 08:20:13 +0000 |
commit | 9a977d1f22b6f2f864a91b80cfd9fd302cb8ad58 (patch) | |
tree | 6e731991bcae6e96c720f4831f330d243505caf4 /epan | |
parent | 9ffe5f61e92e49833c256d47a7db5a4e09e6e002 (diff) |
[Automatic update for 2019-10-06]
Update manuf, services enterprise numbers, translations, and other items.
Change-Id: I1489711e2f2cd69512f05eab85c93729349271f1
Reviewed-on: https://code.wireshark.org/review/34715
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/usb.c | 61 |
1 files changed, 60 insertions, 1 deletions
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c index d6e208789f..b14aa2bef6 100644 --- a/epan/dissectors/usb.c +++ b/epan/dissectors/usb.c @@ -109,7 +109,7 @@ static const value_string usb_vendors_vals[] = { { 0x0421, "Nokia Mobile Phones" }, { 0x0422, "ADI Systems, Inc." }, { 0x0423, "Computer Access Technology Corp." }, - { 0x0424, "Standard Microsystems Corp." }, + { 0x0424, "Microchip Technology, Inc. (formerly SMSC)" }, { 0x0425, "Motorola Semiconductors HK, Ltd" }, { 0x0426, "Integrated Device Technology, Inc." }, { 0x0427, "Motorola Electronics Taiwan, Ltd" }, @@ -2907,6 +2907,7 @@ static const value_string usb_vendors_vals[] = { { 0x273f, "Hughski Limited" }, { 0x2770, "NHJ, Ltd" }, { 0x27b8, "ThingM" }, + { 0x27c6, "Shenzhen Goodix Technology Co.,Ltd." }, { 0x2821, "ASUSTek Computer Inc." }, { 0x2899, "Toptronic Industrial Co., Ltd" }, { 0x289b, "Dracal/Raphnet technologies" }, @@ -3080,6 +3081,7 @@ static const value_string usb_products_vals[] = { { 0x03da0002, "HD44780 LCD interface" }, { 0x03e72150, "Myriad VPU [Movidius Neural Compute Stick]" }, { 0x03e72485, "Movidius MyriadX" }, + { 0x03e7f63b, "Myriad VPU [Movidius Neural Compute Stick]" }, { 0x03e80004, "SE401 Webcam" }, { 0x03e80008, "101 Ethernet [klsi]" }, { 0x03e80015, "ATAPI Enclosure" }, @@ -3249,6 +3251,7 @@ static const value_string usb_products_vals[] = { { 0x03f00601, "ScanJet 6300c" }, { 0x03f00604, "DeskJet 840c" }, { 0x03f00605, "ScanJet 2200c" }, + { 0x03f00610, "Z24i Monitor Hub" }, { 0x03f00611, "OfficeJet K60xi" }, { 0x03f00612, "business inkjet 3000" }, { 0x03f00624, "Bluetooth Dongle" }, @@ -3271,6 +3274,7 @@ static const value_string usb_products_vals[] = { { 0x03f00912, "Printing Support" }, { 0x03f00917, "LaserJet 3330" }, { 0x03f00924, "Modular Smartcard Keyboard" }, + { 0x03f00941, "X500 Optical Mouse" }, { 0x03f0094a, "Optical Mouse [672662-001]" }, { 0x03f00a01, "ScanJet 2400c" }, { 0x03f00a17, "color LaserJet 3700" }, @@ -3961,6 +3965,7 @@ static const value_string usb_products_vals[] = { { 0x04081030, "FV TouchCam N1 (Video)" }, { 0x04083000, "Optical dual-touch panel" }, { 0x04083001, "Optical Touch Screen" }, + { 0x0408a060, "HD Webcam" }, { 0x0408b009, "Medion MD99000 (P9514)/Olivetti Olipad 110" }, { 0x0408b00a, "Medion Lifetab P9514" }, { 0x04090011, "PC98 Series Layout Keyboard Mouse" }, @@ -4149,6 +4154,10 @@ static const value_string usb_products_vals[] = { { 0x040a402b, "Photo Printer 6850" }, { 0x040a402e, "605 Photo Printer" }, { 0x040a4034, "805 Photo Printer" }, + { 0x040a4035, "7000 Photo Printer" }, + { 0x040a4037, "7010 Photo Printer" }, + { 0x040a4038, "7015 Photo Printer" }, + { 0x040a404d, "8810 Photo Printer" }, { 0x040a404f, "305 Photo Printer" }, { 0x040a4056, "ESP 7200 Series AiO" }, { 0x040a4109, "EasyShare Printer Dock Series 3" }, @@ -4291,6 +4300,7 @@ static const value_string usb_products_vals[] = { { 0x04167721, "Memory Stick Reader/Writer" }, { 0x04167722, "Memory Stick Reader/Writer" }, { 0x04167723, "SD Card Reader" }, + { 0x0416c141, "Barcode Scanner" }, { 0x04190001, "IrDA Remote Controller / Creative Cordless Mouse" }, { 0x04190600, "Desktop Wireless 6000" }, { 0x04192694, "Laila" }, @@ -4673,6 +4683,29 @@ static const value_string usb_products_vals[] = { { 0x04244041, "Hub and media card controller" }, { 0x04244060, "Ultra Fast Media Reader" }, { 0x04244064, "Ultra Fast Media Reader" }, + { 0x04244712, "USB4712 high-speed hub" }, + { 0x04244713, "USB4715 high-speed hub (2 ports disabled)" }, + { 0x04244714, "USB4715 high-speed hub (1 port disabled)" }, + { 0x04244715, "USB4715 high-speed hub" }, + { 0x04244910, "USB491x hub integrated functions (primary)" }, + { 0x04244912, "USB4912 high-speed hub (1 port disabled)" }, + { 0x04244914, "USB4914 high-speed hub" }, + { 0x04244916, "USB4916 high-speed hub" }, + { 0x04244920, "USB491x hub integrated functions (secondary)" }, + { 0x04244925, "USB4925 high-speed hub (primary upstream)" }, + { 0x04244927, "USB4927 high-speed hub (primary upstream)" }, + { 0x04244931, "USB4925/4927 high-speed hub (secondary upstream)" }, + { 0x04244940, "USB47xx/49xx hub integrated WinUSB" }, + { 0x04244942, "USB47xx/49xx hub integrated I2S audio port" }, + { 0x04244943, "USB47xx/49xx hub integrated I2S audio + HID port" }, + { 0x04244944, "USB47xx/49xx hub integrated serial port" }, + { 0x04244946, "USB47xx/49xx hub integrated serial + I2S audio port" }, + { 0x04244947, "USB47xx/49xx hub integrated serial + I2S audio + HID port" }, + { 0x0424494a, "USB47xx/49xx hub integrated WinUSB + I2S audio port" }, + { 0x0424494b, "USB47xx/49xx hub integrated WinUSB + I2S audio + HID port" }, + { 0x0424494c, "USB47xx/49xx hub integrated WinUSB + serial port" }, + { 0x0424494e, "USB47xx/49xx hub integrated WinUSB + serial + I2S audio port" }, + { 0x0424494f, "USB47xx/49xx hub integrated WinUSB + serial + I2S audio + HID port" }, { 0x04245434, "Hub" }, { 0x04245534, "Hub" }, { 0x04245744, "Hub" }, @@ -4699,6 +4732,7 @@ static const value_string usb_products_vals[] = { { 0x04300083, "109 Japanese Keyboard" }, { 0x043000a2, "Type 7 Keyboard" }, { 0x04300100, "3-button Mouse" }, + { 0x04300502, "Panasonic CF-19 HID Touch Panel" }, { 0x0430100e, "24.1\" LCD Monitor v4 / FID-638 Mouse" }, { 0x043036ba, "Bus Powered Hub" }, { 0x0430a101, "remote key/mouse for P3 chip" }, @@ -4714,6 +4748,7 @@ static const value_string usb_products_vals[] = { { 0x04331101, "IBM Game Controller" }, { 0x0433abab, "Keyboard" }, { 0x04360005, "CameraMate (DPCM_USB)" }, + { 0x04387900, "Root Hub" }, { 0x043d0001, "Laser Printer" }, { 0x043d0002, "Optra E310 Printer" }, { 0x043d0003, "Laser Printer" }, @@ -4974,7 +5009,16 @@ static const value_string usb_products_vals[] = { { 0x0451e003, "TI-84 Plus Calculator" }, { 0x0451e004, "TI-89 Titanium Calculator" }, { 0x0451e008, "TI-84 Plus Silver Calculator" }, + { 0x0451e00e, "TI-89 Titanium Presentation Link" }, + { 0x0451e00f, "TI-84 Plus Presentation Link" }, + { 0x0451e010, "TI SmartPad Keyboard" }, + { 0x0451e011, "Nspire CAS+ prototype" }, { 0x0451e012, "TI-Nspire Calculator" }, + { 0x0451e013, "Network Bridge" }, + { 0x0451e01c, "Data Collection Sled [Nspire Lab Cradle, Nspire Datatracker Cradle]" }, + { 0x0451e01f, "Python Adapter (firmware install mode)" }, + { 0x0451e020, "Python Adapter" }, + { 0x0451e022, "Nspire CX II" }, { 0x0451f430, "MSP-FET430UIF JTAG Tool" }, { 0x0451f432, "eZ430 Development Tool" }, { 0x0451ffff, "Bluetooth Device" }, @@ -5024,6 +5068,7 @@ static const value_string usb_products_vals[] = { { 0x04580100, "EasyPen Tablet" }, { 0x04580101, "CueCat" }, { 0x0458011b, "NetScroll T220" }, + { 0x04580186, "Genius DX-120 Mouse" }, { 0x04581001, "Joystick" }, { 0x04581002, "Game Pad" }, { 0x04581003, "Genius VideoCam" }, @@ -5056,11 +5101,15 @@ static const value_string usb_products_vals[] = { { 0x04583018, "Wireless 2.4Ghz Game Pad" }, { 0x04583019, "10-Button USB Joystick with Vibration" }, { 0x0458301a, "MaxFire G-12U Vibration" }, + { 0x0458301c, "Genius MaxFighter F-16U" }, { 0x0458301d, "Genius MaxFire MiniPad" }, { 0x0458400f, "Genius TVGo DVB-T02Q MCE" }, { 0x04584012, "TVGo DVB-T03 [AF9015]" }, { 0x04585003, "G-pen 560 Tablet" }, { 0x04585004, "G-pen Tablet" }, + { 0x04585005, "Genius EasyPen M406" }, + { 0x04585012, "Genius EasyPen M406W" }, + { 0x04585014, "Genius EasyPen 340" }, { 0x0458505e, "Genius iSlim 330" }, { 0x04586001, "GF3000F Ethernet Adapter" }, { 0x04587004, "VideoCAM Express V2" }, @@ -20004,6 +20053,16 @@ static const value_string usb_products_vals[] = { { 0x2770930b, "CCD Webcam(PC370R)" }, { 0x2770930c, "CCD Webcam(PC370R)" }, { 0x27b801ed, "blink(1)" }, + { 0x27c65117, "Fingerprint Reader" }, + { 0x27c65201, "Fingerprint Reader" }, + { 0x27c65301, "Fingerprint Reader" }, + { 0x27c6530c, "Fingerprint Reader" }, + { 0x27c65385, "Fingerprint Reader" }, + { 0x27c6538c, "Fingerprint Reader" }, + { 0x27c65395, "Fingerprint Reader" }, + { 0x27c65584, "Fingerprint Reader" }, + { 0x27c655b4, "Fingerprint Reader" }, + { 0x27c65740, "Fingerprint Reader" }, { 0x28210161, "WL-161 802.11b Wireless Adapter [SiS 162U]" }, { 0x2821160f, "WL-160g 802.11g Wireless Adapter [Envara WiND512]" }, { 0x28213300, "WL-140 / Hawking HWU36D 802.11b Wireless Adapter [Intersil PRISM 3]" }, |