summaryrefslogtreecommitdiffstats
path: root/epan/dissectors/usb.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/usb.c')
-rw-r--r--epan/dissectors/usb.c25
1 files changed, 20 insertions, 5 deletions
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 0c76303e..f524a41a 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -5812,6 +5812,7 @@ static const value_string usb_products_vals[] = {
{ 0x045e02e3, "Xbox One Elite Controller" },
{ 0x045e02e6, "Xbox Wireless Adapter for Windows" },
{ 0x045e02ea, "Xbox One Controller" },
+ { 0x045e02f3, "Xbox One Chatpad" },
{ 0x045e02fd, "Xbox One S Controller [Bluetooth]" },
{ 0x045e02fe, "Xbox Wireless Adapter for Windows" },
{ 0x045e0306, "Surface Pro 7 SD Card Reader" },
@@ -7963,6 +7964,7 @@ static const value_string usb_products_vals[] = {
{ 0x04a932ea, "Canon EOS 90D" },
{ 0x04a932ee, "Canon PowerShot SX70 HS" },
{ 0x04a932ef, "Canon EOS M200" },
+ { 0x04a932f0, "Canon PowerShot G7 X Mark III" },
{ 0x04a932f1, "Canon EOS 850D" },
{ 0x04a932f4, "Canon EOS R5" },
{ 0x04a932f5, "Canon EOS R6" },
@@ -8555,7 +8557,7 @@ static const value_string usb_products_vals[] = {
{ 0x04bf0a28, "INDI AV-IN Device" },
{ 0x04bf1301, "Network Controller" },
{ 0x04bf1302, "i3 Gateway" },
- { 0x04bf1303, "3 Micro Module" },
+ { 0x04bf1303, "i3 Micro Module" },
{ 0x04bf1304, "i3 Module" },
{ 0x04bf1305, "i3 Multi Sensing Module" },
{ 0x04c10020, "56K Voice Pro" },
@@ -10051,6 +10053,7 @@ static const value_string usb_products_vals[] = {
{ 0x04f92060, "PT-E550W P-touch Label Printer" },
{ 0x04f92061, "PT-P700 P-touch Label Printer" },
{ 0x04f92064, "PT-P700 P-touch Label Printer RemovableDisk" },
+ { 0x04f92065, "PT-P750W P-Touch Label Writer" },
{ 0x04f92074, "PT-D600 P-touch Label Printer" },
{ 0x04f9209b, "QL-800 Label Printer" },
{ 0x04f9209c, "QL-810W Label Printer" },
@@ -11115,6 +11118,7 @@ static const value_string usb_products_vals[] = {
{ 0x056a03dd, "PTH-460 [Intuos Pro BT (S)] tablet" },
{ 0x056a03ec, "DTH134 [DTH134] touchscreen" },
{ 0x056a03ed, "DTC121 [DTC121] touchscreen" },
+ { 0x056a03f0, "DTH135 [Movink 13]" },
{ 0x056a0400, "PenPartner 4x5" },
{ 0x056a4001, "TPC4001" },
{ 0x056a4004, "TPC4004" },
@@ -12623,6 +12627,7 @@ static const value_string usb_products_vals[] = {
{ 0x05e30752, "micros Reader" },
{ 0x05e30760, "USB 2.0 Card Reader/Writer" },
{ 0x05e30761, "Genesys Mass Storage Device" },
+ { 0x05e30769, "SPR2801S [Lightspeeur 2801]" },
{ 0x05e30780, "USBFS DFU Adapter" },
{ 0x05e307a0, "Pen Flash" },
{ 0x05e30880, "Wasp (SL-6612)" },
@@ -14166,7 +14171,7 @@ static const value_string usb_products_vals[] = {
{ 0x079b0056, "Agfa AP1100 Photo Printer" },
{ 0x079b005d, "Mobile Mass Storage" },
{ 0x079b005f, "Laser Pro LL [MFPrinter]" },
- { 0x079b0062, "XG-76NA 802.11bg" },
+ { 0x079b0062, "XG-76NA / XG-760N 802.11b/g Wireless adapter" },
{ 0x079b0078, "Laser Pro Monochrome MFP" },
{ 0x079d0201, "GamePort Adapter" },
{ 0x07a1d952, "Palladio USB V.92 Modem" },
@@ -14413,6 +14418,7 @@ static const value_string usb_products_vals[] = {
{ 0x07ca1228, "MPEG-2 Capture Device (M038)" },
{ 0x07ca1830, "AVerTV Volar Video Capture (H830)" },
{ 0x07ca1871, "TD310 DVB-T/T2/C dongle" },
+ { 0x07ca2553, "Live Gamer Ultra 2.1" },
{ 0x07ca3835, "AVerTV Volar Green HD (A835B)" },
{ 0x07ca850a, "AverTV Volar Black HD (A850)" },
{ 0x07ca850b, "AverTV Red HD+ (A850T)" },
@@ -14424,6 +14430,7 @@ static const value_string usb_products_vals[] = {
{ 0x07cab300, "A300 DVB-T TV receiver" },
{ 0x07cab800, "MR800 FM Radio" },
{ 0x07cac039, "DVD EZMaker 7" },
+ { 0x07cad553, "Live Gamer Ultra Pro-RGB" },
{ 0x07cae880, "MPEG-2 Capture Device (E880)" },
{ 0x07cae882, "MPEG-2 Capture Device (E882)" },
{ 0x07cc0000, "CF Card Reader" },
@@ -15382,7 +15389,7 @@ static const value_string usb_products_vals[] = {
{ 0x09300a0b, "WLU5053 802.11abgn Wireless Module [Broadcom BCM43236B]" },
{ 0x09300a13, "AX88179 Gigabit Ethernet [Toshiba]" },
{ 0x09300b05, "PX1220E-1G25 External hard drive" },
- { 0x09300b09, "PX1396E-3T01 External hard drive" },
+ { 0x09300b09, "PX139xE 3.5 External HDD" },
{ 0x09300b1a, "STOR.E ALU 2S" },
{ 0x09301300, "Wireless Broadband (CDMA EV-DO) SM-Bus Minicard Status Port" },
{ 0x09301301, "Wireless Broadband (CDMA EV-DO) Minicard Status Port" },
@@ -15500,6 +15507,7 @@ static const value_string usb_products_vals[] = {
{ 0x0944010f, "nanoKONTROL studio controller" },
{ 0x09440117, "nanoKONTROL2 MIDI Controller" },
{ 0x0944012f, "SQ-1" },
+ { 0x09440154, "NTS-1 digital kit mkII" },
{ 0x09440203, "KRONOS" },
{ 0x09440f03, "K-Series K61P MIDI studio controller" },
{ 0x09480301, "USB Pro (24/48)" },
@@ -15942,6 +15950,7 @@ static const value_string usb_products_vals[] = {
{ 0x0a5c5803, "BCM5880 Secure Applications Processor with secure keyboard" },
{ 0x0a5c5804, "BCM5880 Secure Applications Processor with fingerprint swipe sensor" },
{ 0x0a5c5832, "BCM5880 Secure Applications Processor Smartcard reader" },
+ { 0x0a5c5843, "BCM58200 ControlVault 3 (FingerPrint sensor + Contacted SmartCard)" },
{ 0x0a5c6300, "Pirelli Remote NDIS Device" },
{ 0x0a5c6410, "BCM20703A1 Bluetooth 4.1 + LE" },
{ 0x0a5cbd11, "BCM4320 802.11bg Wireless Adapter" },
@@ -15956,11 +15965,14 @@ static const value_string usb_products_vals[] = {
{ 0x0a5f0009, "LP2844 Printer" },
{ 0x0a5f0027, "ZTC LP2844-Z-200dpi" },
{ 0x0a5f0050, "P120i / WM120i" },
+ { 0x0a5f0062, "GK420d Label Printer" },
+ { 0x0a5f0065, "ZM400 Label Printer" },
{ 0x0a5f0080, "GK420d Label Printer" },
{ 0x0a5f0081, "GK420t Label Printer" },
{ 0x0a5f0084, "GX420d Desktop Label Printer" },
{ 0x0a5f008b, "HC100 wristbands Printer" },
{ 0x0a5f008c, "ZP 450 Printer" },
+ { 0x0a5f00a1, "TLP2824 Plus" },
{ 0x0a5f00d1, "GC420d Label Printer" },
{ 0x0a5f0110, "ZD500 Desktop Label Printer" },
{ 0x0a5f011c, "ZD410 Direct Thermal Label Printer" },
@@ -15968,6 +15980,7 @@ static const value_string usb_products_vals[] = {
{ 0x0a5f0172, "ZT411 Barcode Label Printer" },
{ 0x0a5f930a, "Printer" },
{ 0x0a620010, "MPMan MP-F40 MP3 Player" },
+ { 0x0a67ffff, "LCS Audio" },
{ 0x0a6b0001, "Compact Flash R/W with MP3 player" },
{ 0x0a6b000f, "FlashDisk" },
{ 0x0a6f0400, "Xanboo" },
@@ -16131,10 +16144,11 @@ static const value_string usb_products_vals[] = {
{ 0x0ac8c42d, "Lenovo IdeaCentre Web Camera" },
{ 0x0ac90000, "Backpack CD-ReWriter" },
{ 0x0ac90001, "BACKPACK 2 Cable" },
- { 0x0ac90010, "BACKPACK" },
+ { 0x0ac90010, "BACKPACK CD Drive" },
{ 0x0ac90011, "Backpack 40GB Hard Drive" },
{ 0x0ac90110, "BACKPACK" },
{ 0x0ac90111, "BackPack" },
+ { 0x0ac910ff, "BACKPACK" },
{ 0x0ac91234, "BACKPACK" },
{ 0x0aca1060, "OPEN NT1 Plus II" },
{ 0x0acd0300, "IDT1221U RS-232 Adapter" },
@@ -16176,7 +16190,7 @@ static const value_string usb_products_vals[] = {
{ 0x0aec3102, "MemoryStick Card Reader" },
{ 0x0aec3201, "MMC/SD+MemoryStick Card Reader" },
{ 0x0aec3216, "HS Card Reader" },
- { 0x0aec3260, "7-in-1 Card Reader" },
+ { 0x0aec3260, "ND3260 7-in-1 Card Reader" },
{ 0x0aec5010, "ND5010 Card Reader" },
{ 0x0af05000, "UMTS Card" },
{ 0x0af06000, "GlobeTrotter 3G datacard" },
@@ -16239,6 +16253,7 @@ static const value_string usb_products_vals[] = {
{ 0x0b0517a0, "Xonar U3 sound card" },
{ 0x0b0517a1, "Eee Note EA800 (mass storage mode)" },
{ 0x0b0517ab, "USB-N13 802.11n Network Adapter (rev. B1) [Realtek RTL8192CU]" },
+ { 0x0b0517b5, "Broadcom BCM20702A0 Bluetooth" },
{ 0x0b0517ba, "N10 Nano 802.11n Network Adapter [Realtek RTL8192CU]" },
{ 0x0b0517c2, "ROG Spitfire" },
{ 0x0b0517c7, "WL-330NUL" },