aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/usb.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-09-06 08:10:49 -0700
committerGerald Combs <gerald@wireshark.org>2015-09-06 15:10:57 +0000
commit4cb37376e7328359e560f07c5a946a4e086f82ba (patch)
tree221fe3ed5e5f4c7ccd7cc3426075ddc1f01affad /epan/dissectors/usb.c
parentb97938994cf8aa62b9a41cdade6b7abeabcd4577 (diff)
[Automatic update for 2015-09-06]
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: If1cc31f1cd036c536a8a8bb9d9094bdb7c9f6f07 Reviewed-on: https://code.wireshark.org/review/10403 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/dissectors/usb.c')
-rw-r--r--epan/dissectors/usb.c112
1 files changed, 92 insertions, 20 deletions
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 495a479175..88922b2a62 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -3000,7 +3000,7 @@ value_string_ext ext_usb_vendors_vals = VALUE_STRING_EXT_INIT(usb_vendors_vals);
static const value_string usb_products_vals[] = {
{ 0x00017778, "Counterfeit flash drive [Kingston]" },
- { 0x00117788, "Flash mass storage drive" },
+ { 0x00117788, "counterfeit flash drive" },
{ 0x00535301, "GW-US54ZGL 802.11bg" },
{ 0x00790006, "PC TWIN SHOCK Gamepad" },
{ 0x00790011, "Gamepad" },
@@ -3221,6 +3221,7 @@ static const value_string usb_products_vals[] = {
{ 0x03f01116, "Jornada 568 Pocket PC" },
{ 0x03f01117, "LaserJet 1300n" },
{ 0x03f01151, "PSC-750xi Printer/Scanner/Copier" },
+ { 0x03f01198, "HID-compliant mouse" },
{ 0x03f01202, "PhotoSmart 320 series" },
{ 0x03f01204, "DeskJet 930c" },
{ 0x03f01205, "ScanJet 4500C/5550C" },
@@ -3762,6 +3763,7 @@ static const value_string usb_products_vals[] = {
{ 0x0403d739, "Propox ISPcable III" },
{ 0x0403d9a9, "Actisense USG-1 NMEA Serial Gateway" },
{ 0x0403d9aa, "Actisense NGT-1 NMEA2000 PC Interface" },
+ { 0x0403d9ab, "Actisense NGT-1 NMEA2000 Gateway" },
{ 0x0403daf4, "Qundis Serial Infrared Head" },
{ 0x0403e0d0, "Total Phase Aardvark I2C/SPI Host Adapter" },
{ 0x0403e521, "EVER Sinline XL Series UPS" },
@@ -3810,6 +3812,7 @@ static const value_string usb_products_vals[] = {
{ 0x0403fc82, "SEMC DSS-20/DSS-25 SyncStation" },
{ 0x0403fd48, "ShipModul MiniPlex-4xUSB NMEA Multiplexer" },
{ 0x0403fd49, "ShipModul MiniPlex-4xUSB-AIS NMEA Multiplexer" },
+ { 0x0403fd4b, "ShipModul MiniPlex NMEA Multiplexer" },
{ 0x0403ff08, "ToolHouse LoopBack Adapter" },
{ 0x0403ff18, "ScienceScope Logbook ML" },
{ 0x0403ff19, "Logbook Bus" },
@@ -4028,6 +4031,7 @@ static const value_string usb_products_vals[] = {
{ 0x040a402b, "Photo Printer 6850" },
{ 0x040a402e, "605 Photo Printer" },
{ 0x040a4034, "805 Photo Printer" },
+ { 0x040a404f, "305 Photo Printer" },
{ 0x040a4056, "ESP 7200 Series AiO" },
{ 0x040a4109, "EasyShare Printer Dock Series 3" },
{ 0x040a410d, "EasyShare G600 Printer Dock" },
@@ -4038,6 +4042,8 @@ static const value_string usb_products_vals[] = {
{ 0x040a6003, "i50" },
{ 0x040a6004, "i60" },
{ 0x040a6005, "i80" },
+ { 0x040a6029, "i900" },
+ { 0x040a602a, "i900" },
{ 0x040b0a68, "Func MS-3 gaming mouse [WT6573F MCU]" },
{ 0x040b6510, "Weltrend Bar Code Reader" },
{ 0x040b6520, "XBOX Xploder" },
@@ -4395,8 +4401,9 @@ static const value_string usb_products_vals[] = {
{ 0x04210334, "Nokia E7" },
{ 0x04210335, "Nokia E7 (Ovi mode)" },
{ 0x04210360, "C1-01 Ovi Suite Mode" },
+ { 0x04210396, "C7-00 (Modem mode)" },
{ 0x042103a4, "C5 (Storage mode)" },
- { 0x042103c0, "C7-00" },
+ { 0x042103c0, "C7-00 (Mass storage mode)" },
{ 0x042103c1, "Nokia C7" },
{ 0x042103cd, "Nokia C7 (ID2)" },
{ 0x042103d1, "N950" },
@@ -4478,9 +4485,11 @@ static const value_string usb_products_vals[] = {
{ 0x04210509, "E65 (Storage mode)" },
{ 0x04210518, "N9 Phone" },
{ 0x0421051a, "Nokia N9" },
+ { 0x0421054d, "C2-01" },
{ 0x04210600, "Digital Pen SU-1B" },
{ 0x04210610, "CS-15 (Internet Stick 3G modem)" },
- { 0x04210661, "Lumia 920" },
+ { 0x04210661, "Lumia 620/920" },
+ { 0x0421069a, "130 [RM-1035] (Charging only)" },
{ 0x04210720, "X (RM-980)" },
{ 0x04210800, "Connectivity Cable DKU-5" },
{ 0x04210801, "Data Cable DKU-6" },
@@ -4503,6 +4512,7 @@ static const value_string usb_products_vals[] = {
{ 0x04242020, "USB Hub" },
{ 0x042420cd, "Sitecom Internal Multi Memory reader/writer MD-005" },
{ 0x042420fc, "6-in-1 Card Reader" },
+ { 0x04242134, "Hub" },
{ 0x04242228, "9-in-2 Card Reader" },
{ 0x0424223a, "8-in-1 Card Reader" },
{ 0x04242503, "USB 2.0 Hub" },
@@ -4519,6 +4529,7 @@ static const value_string usb_products_vals[] = {
{ 0x04244060, "Ultra Fast Media Reader" },
{ 0x04244064, "Ultra Fast Media Reader" },
{ 0x04245434, "Hub" },
+ { 0x04245534, "Hub" },
{ 0x04247500, "LAN7500 Ethernet 10/100/1000 Adapter" },
{ 0x04249512, "SMC9512/9514 USB Hub" },
{ 0x04249514, "SMC9514 Hub" },
@@ -4807,9 +4818,10 @@ static const value_string usb_products_vals[] = {
{ 0x04580006, "Easy Mouse+" },
{ 0x0458000b, "NetMouse Wheel(P+U)" },
{ 0x0458000c, "TACOMA Fingerprint V1.06.01" },
- { 0x0458000e, "VideoCAM Web" },
+ { 0x0458000e, "Genius NetScroll Optical" },
{ 0x04580013, "TACOMA Fingerprint Mouse V1.06.01" },
{ 0x0458001a, "Genius WebScroll+" },
+ { 0x0458002e, "NetScroll + Traveler / NetScroll 110" },
{ 0x04580036, "Pocket Mouse LE" },
{ 0x04580039, "NetScroll+ Superior" },
{ 0x0458003a, "NetScroll+ Mini Traveler / Genius NetScroll 120" },
@@ -5196,7 +5208,9 @@ static const value_string usb_products_vals[] = {
{ 0x045e0779, "LifeCam HD-3000" },
{ 0x045e0780, "Comfort Curve Keyboard 3000" },
{ 0x045e0797, "Optical Mouse 200" },
+ { 0x045e07a5, "Wireless Receiver 1461C" },
{ 0x045e07f8, "Wired Keyboard 600 (model 1576)" },
+ { 0x045e07fd, "Nano Transceiver 1.1" },
{ 0x045e930a, "ISOUSB.SYS Intel 82930 Isochronous IO Test Board" },
{ 0x045effca, "Catalina" },
{ 0x045efff8, "Keyboard" },
@@ -5315,6 +5329,7 @@ static const value_string usb_products_vals[] = {
{ 0x046d082b, "Webcam C170" },
{ 0x046d082d, "HD Pro Webcam C920" },
{ 0x046d0830, "QuickClip" },
+ { 0x046d0836, "B525 HD Webcam" },
{ 0x046d0837, "BCC950 ConferenceCam" },
{ 0x046d0840, "QuickCam Express" },
{ 0x046d0843, "Webcam C930e" },
@@ -5421,7 +5436,7 @@ static const value_string usb_products_vals[] = {
{ 0x046d0a29, "H600 [Wireless Headset]" },
{ 0x046d0a37, "USB Headset H540" },
{ 0x046d0a38, "Headset H340" },
- { 0x046d0a44, "Wired headset" },
+ { 0x046d0a44, "Headset H390" },
{ 0x046d0a4d, "G430 Surround Sound Gaming Headset" },
{ 0x046d0b02, "C-UV35 [Bluetooth Mini-Receiver] (HID proxy mode)" },
{ 0x046d8801, "Video Camera" },
@@ -5494,6 +5509,7 @@ static const value_string usb_products_vals[] = {
{ 0x046dc06b, "G700 Wireless Gaming Mouse" },
{ 0x046dc06c, "Optical Mouse" },
{ 0x046dc077, "M105 Optical Mouse" },
+ { 0x046dc07c, "M-R0017 [G700s Rechargeable Gaming Mouse]" },
{ 0x046dc101, "UltraX Media Remote" },
{ 0x046dc110, "Harmony 785/885 Remote" },
{ 0x046dc111, "Harmony 525 Remote" },
@@ -5569,7 +5585,7 @@ static const value_string usb_products_vals[] = {
{ 0x046dc305, "Internet Keyboard" },
{ 0x046dc307, "Internet Keyboard" },
{ 0x046dc308, "Internet Navigator Keyboard" },
- { 0x046dc309, "Internet Keyboard" },
+ { 0x046dc309, "Y-BF37 [Internet Navigator Keyboard]" },
{ 0x046dc30a, "iTouch Composite" },
{ 0x046dc30b, "NetPlay Keyboard" },
{ 0x046dc30c, "Internet Keys (X)" },
@@ -5622,6 +5638,7 @@ static const value_string usb_products_vals[] = {
{ 0x046dc52d, "R700 Remote Presenter receiver" },
{ 0x046dc52e, "MK260 Wireless Combo Receiver" },
{ 0x046dc52f, "Unifying Receiver" },
+ { 0x046dc531, "C-U0007 [Unifying Receiver]" },
{ 0x046dc532, "Unifying Receiver" },
{ 0x046dc534, "Unifying Receiver" },
{ 0x046dc603, "3Dconnexion Spacemouse Plus XT" },
@@ -5924,6 +5941,7 @@ static const value_string usb_products_vals[] = {
{ 0x0480a007, "External Disk USB 3.0" },
{ 0x0480a009, "Stor.E Basics" },
{ 0x0480a00d, "STOR.E BASICS 500GB" },
+ { 0x0480a202, "Canvio Basics HDD" },
{ 0x0480b001, "Stor.E Partner" },
{ 0x0480d000, "External Disk 2TB Model DT01ABA200" },
{ 0x0480d010, "External Disk 3TB" },
@@ -5960,9 +5978,11 @@ static const value_string usb_products_vals[] = {
{ 0x04835710, "Joystick in FS Mode" },
{ 0x04835720, "STM microSD Flash Device" },
{ 0x04835721, "Hantek DDS-3X25 Arbitrary Waveform Generator" },
+ { 0x04835730, "STM32 Audio Streaming" },
{ 0x04835740, "STM32F407" },
{ 0x04837270, "ST Micro Serial Bridge" },
{ 0x04837554, "56k SoftModem" },
+ { 0x048391d1, "Sensor Hub" },
{ 0x0483df11, "STM Device in DFU Mode" },
{ 0x0483ff10, "Swann ST56 Modem" },
{ 0x04860185, "EeePC T91MT HID Touch Panel" },
@@ -5974,6 +5994,7 @@ static const value_string usb_products_vals[] = {
{ 0x0489e003, "Pirelli DP-L10" },
{ 0x0489e00d, "Broadcom Bluetooth 2.1 Device" },
{ 0x0489e00f, "Foxconn T77H114 BCM2070 [Single-Chip Bluetooth 2.1 + EDR Adapter]" },
+ { 0x0489e011, "Acer Bluetooth module" },
{ 0x0489e016, "Ubee PXU1900 WiMAX Adapter [Beceem BCSM250]" },
{ 0x0489e02c, "Atheros AR5BBU12 Bluetooth Device" },
{ 0x0489e032, "Broadcom BCM20702 Bluetooth" },
@@ -6331,6 +6352,7 @@ static const value_string usb_products_vals[] = {
{ 0x04a91729, "MX700 ser" },
{ 0x04a9172b, "MP140 ser" },
{ 0x04a91736, "PIXMA MX320 series" },
+ { 0x04a9173a, "MP250 series printer" },
{ 0x04a9173b, "PIXMA MP270 All-In-One Printer" },
{ 0x04a9173e, "MP560" },
{ 0x04a9173f, "Pixma MP640 Multifunction device" },
@@ -6625,6 +6647,7 @@ static const value_string usb_products_vals[] = {
{ 0x04a93160, "Canon Digital IXUS 860 IS" },
{ 0x04a93170, "SELPHY CP750" },
{ 0x04a93171, "SELPHY CP740" },
+ { 0x04a93172, "SELPHY CP520" },
{ 0x04a93173, "Canon Digital IXUS 970 IS" },
{ 0x04a93174, "Canon Digital IXUS 85 IS" },
{ 0x04a93175, "Canon PowerShot SD770 IS" },
@@ -6759,6 +6782,7 @@ static const value_string usb_products_vals[] = {
{ 0x04a9329a, "PowerShot SX60 HS" },
{ 0x04a9329b, "PowerShot SX520 HS" },
{ 0x04a9329c, "PowerShot SX400 IS" },
+ { 0x04a9329f, "PowerShot SX530 HS" },
{ 0x04ad2501, "Bluetooth Device" },
{ 0x04b00102, "Coolpix 990" },
{ 0x04b00103, "Coolpix 880" },
@@ -7266,6 +7290,7 @@ static const value_string usb_products_vals[] = {
{ 0x04ca300d, "Atheros AR3012 Bluetooth" },
{ 0x04ca300f, "Atheros AR3012 Bluetooth" },
{ 0x04ca7025, "HP HD Webcam" },
+ { 0x04ca7046, "TOSHIBA Web Camera - HD" },
{ 0x04ca9304, "Hub" },
{ 0x04caf01c, "TT1280DA DVB-T TV Tuner" },
{ 0x04cb0100, "FinePix 30i/40i/50i, A101/201, 1300/2200, 1400/2400/2600/2800/4500/4700/4800/4900/6800/6900 Zoom" },
@@ -7420,10 +7445,13 @@ static const value_string usb_products_vals[] = {
{ 0x04d88001, "ICD2 in-circuit debugger" },
{ 0x04d88101, "PIC24F Starter Kit" },
{ 0x04d88107, "Microstick II" },
+ { 0x04d88108, "ChipKit Pro MX7 (PIC32MX)" },
{ 0x04d89004, "Microchip REAL ICE" },
{ 0x04d8900a, "PICkit3" },
{ 0x04d8c001, "PicoLCD 20x4" },
{ 0x04d8e11c, "TL866CS EEPROM Programmer [MiniPRO]" },
+ { 0x04d8f2c4, "Macareux-labs Hygrometry Temperature Sensor" },
+ { 0x04d8f3aa, "Macareux-labs Usbce Bootloader mode" },
{ 0x04d8f437, "SBE Tech Ultrasonic Anemometer" },
{ 0x04d8f4b5, "SmartScope" },
{ 0x04d8f8da, "Hughski Ltd. ColorHug" },
@@ -7443,7 +7471,7 @@ static const value_string usb_products_vals[] = {
{ 0x04d90499, "Optical Mouse" },
{ 0x04d91203, "Keyboard" },
{ 0x04d91400, "PS/2 keyboard + mouse controller" },
- { 0x04d91503, "Shortboard Lefty" },
+ { 0x04d91503, "Keyboard" },
{ 0x04d91603, "Keyboard" },
{ 0x04d91702, "Keyboard LKS02" },
{ 0x04d92011, "Keyboard [Diatec Filco Majestouch 1]" },
@@ -7789,6 +7817,7 @@ static const value_string usb_products_vals[] = {
{ 0x04e860c4, "M2 Portable Hard Drive USB 3.0" },
{ 0x04e86124, "D3 Station External Hard Drive" },
{ 0x04e86125, "D3 Station External Hard Drive" },
+ { 0x04e861b5, "M3 Portable Hard Drive 2TB" },
{ 0x04e861b6, "M3 Portable Hard Drive 1TB" },
{ 0x04e86601, "Mobile Phone" },
{ 0x04e86602, "Galaxy" },
@@ -7845,6 +7874,7 @@ static const value_string usb_products_vals[] = {
{ 0x04e86875, "GT-B3710 Standalone LTE device (Commercial)" },
{ 0x04e86876, "GT-B3710 LTE Modem" },
{ 0x04e86877, "Samsung Galaxy models Kies mode" },
+ { 0x04e8687a, "GT-E2370 mobile phone" },
{ 0x04e86888, "GT-B3730 Composite LTE device (Commercial)" },
{ 0x04e86889, "GT-B3730 Composite LTE device (Commercial)" },
{ 0x04e8689a, "LTE Storage Driver [CMC2xx]" },
@@ -7891,6 +7921,7 @@ static const value_string usb_products_vals[] = {
{ 0x04f20760, "Acer KU-0760 Keyboard" },
{ 0x04f20841, "HP Multimedia Keyboard" },
{ 0x04f20860, "2.4G Multimedia Wireless Kit" },
+ { 0x04f21061, "HP KG-1061 Wireless Keyboard+Mouse" },
{ 0x04f21121, "Periboard 717 Mini Wireless Keyboard" },
{ 0x04f2a001, "E-Video DC-100 Camera" },
{ 0x04f2a120, "ORITE CCD Webcam(PC370R)" },
@@ -7901,6 +7932,7 @@ static const value_string usb_products_vals[] = {
{ 0x04f2a128, "PC Camera (SN9C202 + OV7663 + EEPROM)" },
{ 0x04f2a133, "Gateway Webcam" },
{ 0x04f2a136, "LabTec Webcam 5500" },
+ { 0x04f2a147, "Medion Webcam" },
{ 0x04f2a204, "DSC WIA Device (1300)" },
{ 0x04f2a208, "DSC WIA Device (2320)" },
{ 0x04f2a209, "Labtec DC-2320" },
@@ -7958,6 +7990,8 @@ static const value_string usb_products_vals[] = {
{ 0x04f2b354, "UVC 1.00 device HD UVC WebCam" },
{ 0x04f2b394, "Integrated Camera" },
{ 0x04f2b3f6, "HD WebCam (Acer)" },
+ { 0x04f2b40e, "HP Truevision HD camera" },
+ { 0x04f2b444, "Lenovo Integrated Webcam" },
{ 0x04f3000a, "Touchscreen" },
{ 0x04f30103, "ActiveJet K-2024 Multimedia Keyboard" },
{ 0x04f301a4, "Wireless Keyboard" },
@@ -7967,6 +8001,7 @@ static const value_string usb_products_vals[] = {
{ 0x04f30230, "3D Optical Mouse" },
{ 0x04f30232, "Mouse" },
{ 0x04f302f4, "2.4G Cordless Mouse" },
+ { 0x04f30381, "Touchscreen" },
{ 0x04f304a0, "Dream Cheeky Stress/Panic Button" },
{ 0x04f90002, "HL-1050 Laser Printer" },
{ 0x04f90005, "Printer" },
@@ -8020,16 +8055,17 @@ static const value_string usb_products_vals[] = {
{ 0x04f9010b, "MFC-860" },
{ 0x04f9010c, "MFC-7400J" },
{ 0x04f9010d, "MFC-9200J" },
- { 0x04f9010e, "MFC3100C Scanner" },
- { 0x04f9010f, "MFC 5100C" },
- { 0x04f90110, "MFC4800 Scanner" },
- { 0x04f90111, "MFC 6800" },
+ { 0x04f9010e, "MFC-3100C Scanner" },
+ { 0x04f9010f, "MFC-5100C" },
+ { 0x04f90110, "MFC-4800 Scanner" },
+ { 0x04f90111, "MFC-6800" },
{ 0x04f90112, "DCP1000 Port(FaxModem)" },
{ 0x04f90113, "MFC-8500" },
{ 0x04f90114, "MFC9700 Port(FaxModem)" },
- { 0x04f90115, "MFC9800 Scanner" },
+ { 0x04f90115, "MFC-9800 Scanner" },
{ 0x04f90116, "DCP1400 Scanner" },
{ 0x04f90119, "MFC-9660" },
+ { 0x04f9011a, "MFC-9860" },
{ 0x04f9011b, "MFC-9880" },
{ 0x04f9011c, "MFC-9760" },
{ 0x04f9011d, "MFC-9070" },
@@ -8038,13 +8074,20 @@ static const value_string usb_products_vals[] = {
{ 0x04f90120, "MFC580 Port(FaxModem)" },
{ 0x04f90121, "MFC-590" },
{ 0x04f90122, "MFC-5100J" },
+ { 0x04f90124, "MFC-4800J" },
+ { 0x04f90125, "MFC-6800J" },
+ { 0x04f90127, "MFC-9800J" },
+ { 0x04f90128, "MFC-8500J" },
{ 0x04f90129, "Imagistics 2500 (MFC-8640D clone)" },
+ { 0x04f9012b, "MFC-9030" },
+ { 0x04f9012e, "FAX4100e IntelliFax 4100e" },
{ 0x04f9012f, "FAX-4750e" },
+ { 0x04f90130, "FAX-5750e" },
{ 0x04f90132, "MFC-5200C RemovableDisk" },
{ 0x04f90135, "MFC-100 Scanner" },
{ 0x04f90136, "MFC-150CL Scanner" },
{ 0x04f9013c, "MFC-890 Port" },
- { 0x04f9013d, "MFC-5200J Printer" },
+ { 0x04f9013d, "MFC-5200J" },
{ 0x04f9013e, "MFC-4420C RemovableDisk" },
{ 0x04f9013f, "MFC-4820C RemovableDisk" },
{ 0x04f90140, "DCP-8020" },
@@ -8054,14 +8097,17 @@ static const value_string usb_products_vals[] = {
{ 0x04f90144, "DCP-4020C RemovableDisk" },
{ 0x04f90146, "MFC-3220C" },
{ 0x04f90147, "FAX-1820C Printer" },
- { 0x04f90148, "MFC-3320CN Printer" },
+ { 0x04f90148, "MFC-3320CN" },
{ 0x04f90149, "FAX-1920CN Printer" },
{ 0x04f9014a, "MFC-3420C" },
{ 0x04f9014b, "MFC-3820CN" },
+ { 0x04f9014c, "DCP-3020C" },
{ 0x04f9014d, "FAX-1815C Printer" },
{ 0x04f9014e, "MFC-8820J" },
+ { 0x04f9014f, "DCP-8025J" },
{ 0x04f90150, "MFC-8220 Port(FaxModem)" },
{ 0x04f90151, "MFC-8210J" },
+ { 0x04f90153, "DCP-1000J" },
{ 0x04f90157, "MFC-3420J Printer" },
{ 0x04f90158, "MFC-3820JN Port(FaxModem)" },
{ 0x04f9015d, "MFC Composite Device" },
@@ -8121,31 +8167,44 @@ static const value_string usb_products_vals[] = {
{ 0x04f901ae, "DCP-750CW RemovableDisk" },
{ 0x04f901af, "MFC-440CN" },
{ 0x04f901b0, "MFC-660CN" },
- { 0x04f901b1, "MFC-665CW Remote Setup Port" },
- { 0x04f901b2, "MFC-845CW Remote Setup Port" },
- { 0x04f901b4, "MFC-460CN Remote Setup Port" },
+ { 0x04f901b1, "MFC-665CW" },
+ { 0x04f901b2, "MFC-845CW" },
+ { 0x04f901b4, "MFC-460CN" },
{ 0x04f901b5, "MFC-630CD" },
{ 0x04f901b6, "MFC-850CDN" },
- { 0x04f901b7, "MFC-5460CN Remote Setup Port" },
+ { 0x04f901b7, "MFC-5460CN" },
{ 0x04f901b8, "MFC-5860CN" },
{ 0x04f901ba, "MFC-3360C" },
{ 0x04f901bd, "MFC-8660DN" },
{ 0x04f901be, "DCP-750CN RemovableDisk" },
- { 0x04f901bf, "MFC-860CDN Remote Setup Port" },
+ { 0x04f901bf, "MFC-860CDN" },
{ 0x04f901c0, "DCP-128C" },
{ 0x04f901c1, "DCP-129C" },
{ 0x04f901c2, "DCP-131C" },
{ 0x04f901c3, "DCP-329C" },
{ 0x04f901c4, "DCP-331C" },
{ 0x04f901c5, "MFC-239C" },
- { 0x04f901ca, "MFC-9440CN Remote Setup Port" },
+ { 0x04f901c9, "DCP-9040CN" },
+ { 0x04f901ca, "MFC-9440CN" },
+ { 0x04f901cb, "DCP-9045CDN" },
+ { 0x04f901cc, "MFC-9840CDW" },
{ 0x04f901ce, "DCP-135C" },
{ 0x04f901cf, "DCP-150C" },
{ 0x04f901d0, "DCP-350C" },
{ 0x04f901d1, "DCP-560CN" },
+ { 0x04f901d2, "DCP-770CW" },
+ { 0x04f901d3, "DCP-770CN" },
{ 0x04f901d4, "MFC-230C" },
{ 0x04f901d5, "MFC-235C" },
{ 0x04f901d6, "MFC-260C" },
+ { 0x04f901d7, "MFC-465CN" },
+ { 0x04f901d8, "MFC-680CN" },
+ { 0x04f901d9, "MFC-685CW" },
+ { 0x04f901da, "MFC-885CW" },
+ { 0x04f901db, "MFC-480CN" },
+ { 0x04f901dc, "MFC-650CD" },
+ { 0x04f901dd, "MFC-870CDN" },
+ { 0x04f901de, "MFC-880CDN" },
{ 0x04f901df, "DCP-155C" },
{ 0x04f901e0, "MFC-265C" },
{ 0x04f901e1, "DCP-153C" },
@@ -8156,8 +8215,18 @@ static const value_string usb_products_vals[] = {
{ 0x04f901e9, "DCP-7040" },
{ 0x04f901ea, "DCP-7030" },
{ 0x04f901eb, "MFC-7320" },
+ { 0x04f901ec, "MFC-9640CW" },
{ 0x04f901f4, "MFC-5890CN" },
+ { 0x04f9020a, "MFC-8670DN" },
+ { 0x04f9020c, "DCP-9042CDN" },
+ { 0x04f9020d, "MFC-9450CDN" },
+ { 0x04f90216, "MFC-8880DN" },
{ 0x04f90217, "MFC-8480DN" },
+ { 0x04f90219, "MFC-8380DN" },
+ { 0x04f9021a, "MFC-8370DN" },
+ { 0x04f9021b, "DCP-8070D" },
+ { 0x04f9021c, "MFC-9320CW" },
+ { 0x04f9021d, "MFC-9120CN" },
{ 0x04f90223, "DCP-365CN" },
{ 0x04f90248, "DCP-7055 scanner/printer" },
{ 0x04f90273, "DCP-7057 scanner/printer" },
@@ -17592,6 +17661,9 @@ static const value_string usb_products_vals[] = {
{ 0x20df0001, "Entropy Key [UDEKEY01]" },
{ 0x20f10101, "iCube3 Camera" },
{ 0x20f4648b, "TEW-648UBM 802.11n 150Mbps Micro Wireless N Adapter [Realtek RTL8188CUS]" },
+ { 0x20f73001, "Camera with CMOS sensor [MQ]" },
+ { 0x20f73021, "Camera with CCD sensor [MD]" },
+ { 0x20f730b3, "Camera with CMOS sensor in Vision mode [MQ]" },
{ 0x20f7a003, "Subminiature 5Mpix B/W Camera, MU9PM-MH" },
{ 0x21009e52, "Yaesu VX-7" },
{ 0x21009e54, "CT29B Radio Cable" },