summaryrefslogtreecommitdiff
path: root/epan
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2017-06-25 08:09:29 +0000
committerGerald Combs <gerald@wireshark.org>2017-06-25 08:09:35 +0000
commit5f7902d1659a138515f01ecf9ade3d271befc029 (patch)
tree648b79de5596a48f246c0a67aec50f2e8b33bb52 /epan
parent74b1268a5ca3a11a791ac7671667f06a11504506 (diff)
downloadwireshark-5f7902d1659a138515f01ecf9ade3d271befc029.tar.gz
[Automatic update for 2017-06-25]
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I6febcb360b1b3e5e761086d422050e6ec95d5c45 Reviewed-on: https://code.wireshark.org/review/22384 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/usb.c392
-rw-r--r--epan/enterprise-numbers170
-rw-r--r--epan/sminmpec.c41
3 files changed, 513 insertions, 90 deletions
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 971704a2bb..13fb6bdc70 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -596,7 +596,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x0627, "Adomax Technology Co., Ltd" },
{ 0x0628, "Tasking Software, Inc." },
{ 0x0629, "Zida Technologies, Ltd" },
- { 0x062a, "Creative Labs" },
+ { 0x062a, "MosArt Semiconductor Corp." },
{ 0x062b, "Greatlink Electronics Taiwan, Ltd" },
{ 0x062c, "Institute for Information Industry" },
{ 0x062d, "Taiwan Tai-Hao Enterprises Co., Ltd" },
@@ -772,6 +772,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x071c, "Xionics Document Technologies, Inc." },
{ 0x071d, "Eicon Networks Corp." },
{ 0x071e, "Ariston Technologies" },
+ { 0x0720, "Keyence Corp." },
{ 0x0723, "Centillium Communications Corp." },
{ 0x0726, "Vanguard International Semiconductor-America" },
{ 0x0729, "Amitm" },
@@ -802,8 +803,9 @@ static const value_string usb_vendors_vals[] = {
{ 0x074e, "Digital Stream Corp." },
{ 0x0755, "Aureal Semiconductor" },
{ 0x0757, "Network Technologies, Inc." },
+ { 0x0758, "Carl Zeiss Microscopy GmbH" },
{ 0x075b, "Sophisticated Circuits, Inc." },
- { 0x0763, "Midiman" },
+ { 0x0763, "M-Audio" },
{ 0x0764, "Cyber Power System, Inc." },
{ 0x0765, "X-Rite, Inc." },
{ 0x0766, "Jess-Link Products Co., Ltd" },
@@ -1105,7 +1107,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x094f, "Yano" },
{ 0x0951, "Kingston Technology" },
{ 0x0954, "RPM Systems Corp." },
- { 0x0955, "NVidia Corp." },
+ { 0x0955, "NVIDIA Corp." },
{ 0x0956, "BSquare Corp." },
{ 0x0957, "Agilent Technologies, Inc." },
{ 0x0958, "CompuLink Research, Inc." },
@@ -1114,6 +1116,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x095b, "Medialogic Corp." },
{ 0x095c, "K-Tec Electronics" },
{ 0x095d, "Polycom, Inc." },
+ { 0x0964, "BITRAN" },
{ 0x0967, "Acer NeWeb Corp." },
{ 0x0968, "Catalyst Enterprises, Inc." },
{ 0x096e, "Feitian Technologies, Inc." },
@@ -1481,6 +1484,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x0c26, "Prolific Technology Inc." },
{ 0x0c27, "RFIDeas, Inc" },
{ 0x0c2e, "Metrologic Instruments" },
+ { 0x0c30, "Mutoh Industries Ltd" },
{ 0x0c35, "Eagletron, Inc." },
{ 0x0c36, "E Ink Corp." },
{ 0x0c37, "e.Digital" },
@@ -2029,6 +2033,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x1060, "Easthome Industrial Co., Ltd" },
{ 0x1063, "Motorola Electronics Taiwan, Ltd [hex]" },
{ 0x1065, "CCYU Technology" },
+ { 0x1068, "Micropi Elettronica" },
{ 0x106a, "Loyal Legend, Ltd" },
{ 0x106c, "Curitel Communications, Inc." },
{ 0x106d, "San Chieh Manufacturing, Ltd" },
@@ -2046,6 +2051,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x108b, "Grand-tek Technology Co., Ltd" },
{ 0x108c, "Robert Bosch GmbH" },
{ 0x108e, "Lotes Co., Ltd." },
+ { 0x1091, "Numerik Jena" },
{ 0x1099, "Surface Optics Corp." },
{ 0x109a, "DATASOFT Systems GmbH" },
{ 0x109b, "Hisense" },
@@ -2108,6 +2114,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x1136, "CTS Electronincs" },
{ 0x113c, "Arin Tech Co., Ltd" },
{ 0x113d, "Mapower Electronics Co., Ltd" },
+ { 0x113f, "Integrated Biometrics, LLC" },
{ 0x1141, "V One Multimedia, Pte., Ltd" },
{ 0x1142, "CyberScan Technologies, Inc." },
{ 0x1145, "Japan Radio Company" },
@@ -2151,6 +2158,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x11ac, "Nike" },
{ 0x11b0, "ATECH FLASH TECHNOLOGY" },
{ 0x11be, "R&D International NV" },
+ { 0x11c0, "Betop" },
{ 0x11c5, "Inmax" },
{ 0x11ca, "VeriFone Inc" },
{ 0x11db, "Topfield Co., Ltd." },
@@ -2164,6 +2172,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x120f, "Magellan" },
{ 0x1210, "DigiTech" },
{ 0x121e, "Jungsoft Co., Ltd" },
+ { 0x1220, "TC Electronic" },
{ 0x1221, "Unknown manufacturer" },
{ 0x1223, "SKYCABLE ENTERPRISE. CO., LTD." },
{ 0x1228, "Datapaq Limited" },
@@ -2194,6 +2203,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x1292, "Innomedia" },
{ 0x1293, "Belkin Components [hex]" },
{ 0x1294, "RISO KAGAKU CORP." },
+ { 0x1297, "DekTec" },
{ 0x129b, "CyberTAN Technology" },
{ 0x12a7, "Trendchip Technologies Corp." },
{ 0x12ab, "Honey Bee Electronic International Ltd." },
@@ -2210,6 +2220,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x12d8, "Araneus Information Systems Oy" },
{ 0x12e6, "Waldorf Music GmbH" },
{ 0x12ef, "Tapwave, Inc." },
+ { 0x12f2, "ViewPlus Technologies, Inc." },
{ 0x12f5, "Dynamic System Electronics Corp." },
{ 0x12f7, "Memorex Products, Inc." },
{ 0x12fd, "AIN Comm. Technology Co., Ltd" },
@@ -2220,6 +2231,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x1312, "ICS Electronics" },
{ 0x1313, "ThorLabs" },
{ 0x131d, "Natural Point" },
+ { 0x1325, "ams AG" },
{ 0x132a, "Envara Inc." },
{ 0x132b, "Konica Minolta" },
{ 0x133e, "Kemper Digital GmbH" },
@@ -4254,6 +4266,7 @@ static const value_string usb_products_vals[] = {
{ 0x041e3100, "IR Receiver (SB0540)" },
{ 0x041e3121, "WoW tap chat" },
{ 0x041e3220, "Sound Blaster Tactic(3D) Sigma sound card" },
+ { 0x041e3232, "Sound Blaster Premium HD [SBX]" },
{ 0x041e3f00, "E-Mu Xboard 25 MIDI Controller" },
{ 0x041e3f02, "E-Mu 0202" },
{ 0x041e3f04, "E-Mu 0404" },
@@ -4612,6 +4625,9 @@ static const value_string usb_products_vals[] = {
{ 0x0430a101, "remote key/mouse for P3 chip" },
{ 0x0430a102, "remote key/mouse/storage for P3 chip" },
{ 0x0430a103, "remote storage for P3 chip" },
+ { 0x0430a111, "remote keyboard for P4 chip" },
+ { 0x0430a112, "remote mouse for P4 chip" },
+ { 0x0430a113, "remote storage for P4 chip" },
{ 0x0430a4a2, "Ethernet (RNDIS and CDC ethernet)" },
{ 0x0430cdab, "Raritan KVM dongle" },
{ 0x04310100, "Mouse-Trak 3-button Track Ball" },
@@ -4767,6 +4783,8 @@ static const value_string usb_products_vals[] = {
{ 0x043d01fa, "S310 series" },
{ 0x043d4303, "Xerox WorkCentre Pro 412" },
{ 0x043e3001, "AN-WF100 802.11abgn Wireless Adapter [Broadcom BCM4323]" },
+ { 0x043e3004, "TWFM-B003D 802.11abgn Wireless Module [Broadcom BCM43236B]" },
+ { 0x043e3101, "AN-WF500 802.11abgn + BT Wireless Adapter [Broadcom BCM43242]" },
{ 0x043e42bd, "Flatron 795FT Plus Monitor" },
{ 0x043e4a4d, "Flatron 915FT Plus Monitor" },
{ 0x043e7001, "MF-PD100 Soul Digital MP3 Player" },
@@ -5274,6 +5292,7 @@ static const value_string usb_products_vals[] = {
{ 0x045e0752, "Wired Keyboard 400" },
{ 0x045e075d, "LifeCam Cinema" },
{ 0x045e0761, "LifeCam VX-2000" },
+ { 0x045e0765, "Xbox360 Slim Internal Wireless Module (1400) [Marvell 88W8786U]" },
{ 0x045e0766, "LifeCam VX-800" },
{ 0x045e0768, "Sidewinder X4" },
{ 0x045e076c, "Comfort Mouse 4500" },
@@ -5409,6 +5428,7 @@ static const value_string usb_products_vals[] = {
{ 0x046d0826, "HD Webcam C525" },
{ 0x046d0828, "HD Webcam B990" },
{ 0x046d082b, "Webcam C170" },
+ { 0x046d082c, "HD Webcam C615" },
{ 0x046d082d, "HD Pro Webcam C920" },
{ 0x046d0830, "QuickClip" },
{ 0x046d0836, "B525 HD Webcam" },
@@ -5599,6 +5619,7 @@ static const value_string usb_products_vals[] = {
{ 0x046dc07c, "M-R0017 [G700s Rechargeable Gaming Mouse]" },
{ 0x046dc07d, "G502 Mouse" },
{ 0x046dc07e, "G402 Gaming Mouse" },
+ { 0x046dc083, "G403 Prodigy Gaming Mouse" },
{ 0x046dc101, "UltraX Media Remote" },
{ 0x046dc110, "Harmony 785/880/885 Remote" },
{ 0x046dc111, "Harmony 525 Remote" },
@@ -5694,7 +5715,9 @@ static const value_string usb_products_vals[] = {
{ 0x046dc31b, "Compact Keyboard K300" },
{ 0x046dc31c, "Keyboard K120" },
{ 0x046dc31d, "Media Keyboard K200" },
+ { 0x046dc31f, "Comfort Keyboard K290" },
{ 0x046dc332, "G502 Proteus Spectrum Optical Mouse" },
+ { 0x046dc335, "G910 Orion Spectrum Mechanical Keyboard" },
{ 0x046dc401, "TrackMan Marble Wheel" },
{ 0x046dc402, "Marble Mouse (2-button)" },
{ 0x046dc403, "Turbo TrackMan Marble FX" },
@@ -6107,6 +6130,7 @@ static const value_string usb_products_vals[] = {
{ 0x048d9306, "IT930x DVB stick" },
{ 0x048d9503, "ITE it9503 feature-limited DVB-T transmission chip [ccHDtv]" },
{ 0x048d9507, "ITE it9507 full featured DVB-T transmission chip [ccHDtv]" },
+ { 0x048d9910, "IT9910 chipset based grabber" },
{ 0x04910003, "Taxan Monitor Control" },
{ 0x04920140, "MP3 player" },
{ 0x04920141, "MP3 Player" },
@@ -6422,47 +6446,110 @@ static const value_string usb_products_vals[] = {
{ 0x04a91601, "DR-2080C Scanner" },
{ 0x04a91607, "DR-6080 Scanner" },
{ 0x04a91608, "DR-2580C Scanner" },
+ { 0x04a91609, "DR-3080CII" },
{ 0x04a91700, "PIXMA MP110 Scanner" },
{ 0x04a91701, "PIXMA MP130 Scanner" },
{ 0x04a91702, "MP410 Composite" },
{ 0x04a91703, "MP430 Composite" },
{ 0x04a91704, "MP330 Composite" },
{ 0x04a91706, "PIXMA MP750 Scanner" },
- { 0x04a91707, "PIXMA MP780 Scanner" },
- { 0x04a91708, "PIXMA MP760 Scanner" },
+ { 0x04a91707, "PIXMA MP780/MP790" },
+ { 0x04a91708, "PIXMA MP760/MP770" },
{ 0x04a91709, "PIXMA MP150 Scanner" },
{ 0x04a9170a, "PIXMA MP170 Scanner" },
{ 0x04a9170b, "PIXMA MP450 Scanner" },
{ 0x04a9170c, "PIXMA MP500 Scanner" },
{ 0x04a9170d, "PIXMA MP800 Scanner" },
- { 0x04a9170e, "MP800R" },
+ { 0x04a9170e, "PIXMA MP800R" },
{ 0x04a91710, "MP950" },
- { 0x04a91712, "MP530" },
+ { 0x04a91712, "PIXMA MP530" },
{ 0x04a91713, "PIXMA MP830 Scanner" },
{ 0x04a91714, "MP160" },
- { 0x04a91715, "MP180 Storage" },
- { 0x04a91716, "MP460 Composite" },
- { 0x04a91717, "MP510" },
- { 0x04a91718, "MP600 Storage" },
- { 0x04a9171a, "MP810 Storage" },
- { 0x04a9171b, "MP960" },
- { 0x04a91721, "MP210 ser" },
- { 0x04a91723, "MP470 ser" },
+ { 0x04a91715, "PIXMA MP180" },
+ { 0x04a91716, "PIXMA MP460" },
+ { 0x04a91717, "PIXMA MP510" },
+ { 0x04a91718, "PIXMA MP600" },
+ { 0x04a91719, "PIXMA MP600R" },
+ { 0x04a9171a, "PIXMA MP810" },
+ { 0x04a9171b, "PIXMA MP960" },
+ { 0x04a9171c, "PIXMA MX7600" },
+ { 0x04a91721, "PIXMA MP210" },
+ { 0x04a91722, "PIXMA MP220" },
+ { 0x04a91723, "PIXMA MP470" },
{ 0x04a91724, "PIXMA MP520 series" },
- { 0x04a91725, "MP610 ser" },
- { 0x04a91726, "MP970 ser" },
- { 0x04a91727, "MX300 ser" },
+ { 0x04a91725, "PIXMA MP610" },
+ { 0x04a91726, "PIXMA MP970" },
+ { 0x04a91727, "PIXMA MX300" },
{ 0x04a91728, "PIXMA MX310 series" },
- { 0x04a91729, "MX700 ser" },
+ { 0x04a91729, "PIXMA MX700" },
{ 0x04a9172b, "MP140 ser" },
+ { 0x04a9172c, "PIXMA MX850" },
+ { 0x04a9172d, "PIXMA MP980" },
+ { 0x04a9172e, "PIXMA MP630" },
+ { 0x04a9172f, "PIXMA MP620" },
+ { 0x04a91730, "PIXMA MP540" },
+ { 0x04a91731, "PIXMA MP480" },
+ { 0x04a91732, "PIXMA MP240" },
+ { 0x04a91733, "PIXMA MP260" },
+ { 0x04a91734, "PIXMA MP190" },
+ { 0x04a91735, "PIXMA MX860" },
{ 0x04a91736, "PIXMA MX320 series" },
- { 0x04a9173a, "MP250 series printer" },
+ { 0x04a91737, "PIXMA MX330" },
+ { 0x04a9173a, "PIXMA MP250" },
{ 0x04a9173b, "PIXMA MP270 All-In-One Printer" },
- { 0x04a9173e, "MP560" },
- { 0x04a9173f, "Pixma MP640 Multifunction device" },
- { 0x04a91748, "Pixma MG5150" },
- { 0x04a9174d, "MX360 ser" },
- { 0x04a9176d, "PIXMA MG2550" },
+ { 0x04a9173c, "PIXMA MP490" },
+ { 0x04a9173d, "PIXMA MP550" },
+ { 0x04a9173e, "PIXMA MP560" },
+ { 0x04a9173f, "PIXMA MP640" },
+ { 0x04a91740, "PIXMA MP990" },
+ { 0x04a91741, "PIXMA MX340" },
+ { 0x04a91742, "PIXMA MX350" },
+ { 0x04a91743, "PIXMA MX870" },
+ { 0x04a91746, "PIXMA MP280" },
+ { 0x04a91747, "PIXMA MP495" },
+ { 0x04a91748, "PIXMA MG5100 Series" },
+ { 0x04a91749, "PIXMA MG5200 Series" },
+ { 0x04a9174a, "PIXMA MG6100 Series" },
+ { 0x04a9174b, "PIXMA MG8100 Series" },
+ { 0x04a9174d, "PIXMA MX360" },
+ { 0x04a9174e, "PIXMA MX410" },
+ { 0x04a9174f, "PIXMA MX420" },
+ { 0x04a91750, "PIXMA MX880 Series" },
+ { 0x04a91752, "PIXMA MG3100 Series" },
+ { 0x04a91753, "PIXMA MG4100 Series" },
+ { 0x04a91754, "PIXMA MG5300 Series" },
+ { 0x04a91755, "PIXMA MG6200 Series" },
+ { 0x04a91756, "PIXMA MG8200 Series" },
+ { 0x04a91757, "PIXMA MP493" },
+ { 0x04a91759, "PIXMA MX370 Series" },
+ { 0x04a9175b, "PIXMA MX430 Series" },
+ { 0x04a9175c, "PIXMA MX510 Series" },
+ { 0x04a9175d, "PIXMA MX710 Series" },
+ { 0x04a9175e, "PIXMA MX890 Series" },
+ { 0x04a9175f, "PIXMA MP230" },
+ { 0x04a91762, "PIXMA MG3200 Series" },
+ { 0x04a91763, "PIXMA MG4200 Series" },
+ { 0x04a91764, "PIXMA MG5400 Series" },
+ { 0x04a91765, "PIXMA MG6300 Series" },
+ { 0x04a91766, "PIXMA MX390 Series" },
+ { 0x04a91768, "PIXMA MX450 Series" },
+ { 0x04a91769, "PIXMA MX520 Series" },
+ { 0x04a9176a, "PIXMA MX720 Series" },
+ { 0x04a9176b, "PIXMA MX920 Series" },
+ { 0x04a9176d, "PIXMA MG2500 Series" },
+ { 0x04a9176e, "PIXMA MG3500 Series" },
+ { 0x04a9176f, "PIXMA MG6500 Series" },
+ { 0x04a91770, "PIXMA MG6400 Series" },
+ { 0x04a91771, "PIXMA MG5500 Series" },
+ { 0x04a91772, "PIXMA MG7100 Series" },
+ { 0x04a91774, "PIXMA MX470 Series" },
+ { 0x04a91775, "PIXMA MX530 Series" },
+ { 0x04a9177c, "PIXMA MG7500 Series" },
+ { 0x04a9177e, "PIXMA MG6600 Series" },
+ { 0x04a9177f, "PIXMA MG5600 Series" },
+ { 0x04a91780, "PIXMA MG2900 Series" },
+ { 0x04a91787, "PIXMA MX490 Series" },
+ { 0x04a9178a, "PIXMA MG3600 Series" },
{ 0x04a9178d, "PIXMA MG6853" },
{ 0x04a91900, "CanoScan LiDE 90" },
{ 0x04a91901, "CanoScan 8800F" },
@@ -6524,19 +6611,20 @@ static const value_string usb_products_vals[] = {
{ 0x04a92629, "FAXPHONE L75" },
{ 0x04a9262b, "LaserShot LBP-1120 Printer" },
{ 0x04a9262d, "iR C3200" },
- { 0x04a9262f, "MultiPASS MP730" },
- { 0x04a92630, "MultiPASS MP700" },
+ { 0x04a9262f, "PIXMA MP730" },
+ { 0x04a92630, "PIXMA MP700" },
{ 0x04a92631, "LASER CLASS 700" },
{ 0x04a92632, "FAX-L2000" },
{ 0x04a92635, "MPC190" },
{ 0x04a92637, "iR C6800" },
{ 0x04a92638, "iR C3100" },
- { 0x04a9263c, "Smartbase MP360" },
- { 0x04a9263d, "MP370" },
- { 0x04a9263e, "MP390 FAX" },
- { 0x04a9263f, "MP375" },
+ { 0x04a9263c, "PIXMA MP360" },
+ { 0x04a9263d, "PIXMA MP370" },
+ { 0x04a9263e, "PIXMA MP390" },
+ { 0x04a9263f, "PIXMA MP375R" },
{ 0x04a92646, "MF5530 Scanner Device V1.9.1" },
{ 0x04a92647, "MF5550 Composite" },
+ { 0x04a9264c, "PIXMA MP740" },
{ 0x04a9264d, "PIXMA MP710" },
{ 0x04a9264e, "MF5630" },
{ 0x04a9264f, "MF5650 (FAX)" },
@@ -6887,6 +6975,7 @@ static const value_string usb_products_vals[] = {
{ 0x04a93277, "PowerShot SX510 HS" },
{ 0x04a93278, "PowerShot S200" },
{ 0x04a9327a, "SELPHY CP910" },
+ { 0x04a9327b, "SELPHY CP820" },
{ 0x04a9327d, "Powershot ELPH 115 IS / IXUS 132" },
{ 0x04a9327f, "EOS Rebel T5 / EOS 1200D / EOS Kiss X70" },
{ 0x04a93284, "PowerShot D30" },
@@ -6911,8 +7000,10 @@ static const value_string usb_products_vals[] = {
{ 0x04a932b1, "SELPHY CP1200" },
{ 0x04a932b2, "PowerShot G9 X" },
{ 0x04a932bb, "EOS M5" },
+ { 0x04a932bf, "PowerShot SX420 IS" },
{ 0x04a932c1, "PowerShot ELPH 180 / IXUS 175" },
{ 0x04a932c2, "PowerShot SX720 HS" },
+ { 0x04a932d5, "PowerShot SX430 IS" },
{ 0x04ad2501, "Bluetooth Device" },
{ 0x04b00102, "Coolpix 990" },
{ 0x04b00103, "Coolpix 880" },
@@ -7043,6 +7134,7 @@ static const value_string usb_products_vals[] = {
{ 0x04b0042d, "Nikon DSC D600" },
{ 0x04b0042e, "Nikon DSC D800E" },
{ 0x04b0042f, "Nikon DSC D5200" },
+ { 0x04b0043f, "D5600" },
{ 0x04b00601, "Nikon V1" },
{ 0x04b00602, "Nikon J1" },
{ 0x04b00f03, "PD-10 Wireless Printer Adapter" },
@@ -7609,6 +7701,7 @@ static const value_string usb_products_vals[] = {
{ 0x04d90022, "Portable Keyboard" },
{ 0x04d9048e, "Optical Mouse" },
{ 0x04d90499, "Optical Mouse" },
+ { 0x04d91135, "Mouse [MGK-15BU/MLK-15BU]" },
{ 0x04d91203, "Keyboard" },
{ 0x04d91400, "PS/2 keyboard + mouse controller" },
{ 0x04d91503, "Keyboard" },
@@ -7626,6 +7719,7 @@ static const value_string usb_products_vals[] = {
{ 0x04d9a01c, "wireless multimedia keyboard with trackball [Trust ADURA 17911]" },
{ 0x04d9a050, "Chatman V1" },
{ 0x04d9a055, "Keyboard" },
+ { 0x04d9a100, "Mouse [HV-MS735]" },
{ 0x04d9a11b, "Mouse [MX-3200]" },
{ 0x04da0901, "LS-120 Camera" },
{ 0x04da0912, "SDR-S10" },
@@ -7665,6 +7759,7 @@ static const value_string usb_products_vals[] = {
{ 0x04da250c, "Gobi Wireless Modem (QDL mode)" },
{ 0x04da250d, "Gobi Wireless Modem" },
{ 0x04da3904, "N5HBZ0000055 802.11abgn Wireless Adapter [Atheros AR7010+AR9280]" },
+ { 0x04da3908, "N5HBZ0000062 802.11abgn Wireless Adapter [Atheros AR9374v1.1]" },
{ 0x04da3c04, "JT-P100MR-20 [ePassport Reader]" },
{ 0x04dd13a6, "MFC2000" },
{ 0x04dd6006, "AL-1216" },
@@ -7774,6 +7869,7 @@ static const value_string usb_products_vals[] = {
{ 0x04e65292, "SCL011 RFID reader" },
{ 0x04e65410, "SCR35xx Smart Card Reader" },
{ 0x04e65591, "SCL3711-NFC&RW" },
+ { 0x04e65810, "uTrust 2700 R Smart Card Reader" },
{ 0x04e6e000, "SCRx31 Reader" },
{ 0x04e6e001, "SCR331 SmartCard Reader" },
{ 0x04e6e003, "SPR532 PinPad SmartCard Reader" },
@@ -7852,6 +7948,7 @@ static const value_string usb_products_vals[] = {
{ 0x04e8329f, "CLP-325 Color Laser Printer" },
{ 0x04e83301, "ML-1660 Series" },
{ 0x04e8330c, "ML-1865" },
+ { 0x04e8330f, "ML-216x Series Laser Printer" },
{ 0x04e83310, "ML-331x Series Laser Printer" },
{ 0x04e83315, "ML-2540 Series Laser Printer" },
{ 0x04e8331e, "M262x/M282x Xpress Series Laser Printer" },
@@ -8143,6 +8240,7 @@ static const value_string usb_products_vals[] = {
{ 0x04f2b330, "Asus 720p CMOS webcam" },
{ 0x04f2b354, "UVC 1.00 device HD UVC WebCam" },
{ 0x04f2b394, "Integrated Camera" },
+ { 0x04f2b3eb, "HP 720p HD Monitor Webcam" },
{ 0x04f2b3f6, "HD WebCam (Acer)" },
{ 0x04f2b40e, "HP Truevision HD camera" },
{ 0x04f2b444, "Lenovo Integrated Webcam" },
@@ -8971,6 +9069,7 @@ static const value_string usb_products_vals[] = {
{ 0x05472750, "EZ-Link (EZLNKUSB.SYS)" },
{ 0x05472810, "Cypress ATAPI Bridge" },
{ 0x05474d90, "AmScope MD1900 camera" },
+ { 0x05476010, "AmScope MU1000 camera" },
{ 0x05476510, "Touptek UCMOS05100KPA" },
{ 0x05477000, "PowerSpec MCE460 Front Panel LED Display" },
{ 0x05477777, "Bluetooth Device" },
@@ -9049,6 +9148,7 @@ static const value_string usb_products_vals[] = {
{ 0x054c014c, "Aiwa AM-NX9 Net MD Music Recorder MDLP" },
{ 0x054c014d, "Memory Stick Reader/Writer" },
{ 0x054c0154, "Eyetoy Audio Device" },
+ { 0x054c0155, "Eyetoy Video Device" },
{ 0x054c015f, "IC Recorder (BM)" },
{ 0x054c0169, "Clie PEG-TJ35 PDA Serial" },
{ 0x054c016a, "Clie PEG-TJ35 PDA Mass Storage" },
@@ -9155,6 +9255,7 @@ static const value_string usb_products_vals[] = {
{ 0x054c038e, "Sony Walkman NWZ-S638F" },
{ 0x054c0398, "Sony Walkman NWZ-X1051/NWZ-X1061" },
{ 0x054c03bc, "Webbie HD - MHS-CM1" },
+ { 0x054c03cc, "SD Card Reader" },
{ 0x054c03d1, "DPF-X95" },
{ 0x054c03d3, "DR-BT100CX" },
{ 0x054c03d5, "PlayStation Move motion controller" },
@@ -9183,7 +9284,7 @@ static const value_string usb_products_vals[] = {
{ 0x054c05a8, "Sony NWZ-S765" },
{ 0x054c05b3, "Sony Sony Tablet S" },
{ 0x054c05b4, "Sony Sony Tablet S1" },
- { 0x054c05c4, "DualShock 4" },
+ { 0x054c05c4, "DualShock 4 [CUH-ZCT1E]" },
{ 0x054c061f, "Sony DSC-HX200V" },
{ 0x054c0689, "Walkman NWZ-B173F" },
{ 0x054c06bb, "WALKMAN NWZ-F805" },
@@ -9193,6 +9294,7 @@ static const value_string usb_products_vals[] = {
{ 0x054c08b7, "ILCE-6000 (aka Alpha-6000) in MTP mode" },
{ 0x054c094e, "ILCE-6000 (aka Alpha-6000) in PC Remote mode" },
{ 0x054c0994, "ILCE-6000 (aka Alpha-6000) in charging mode" },
+ { 0x054c09cc, "DualShock 4 [CUH-ZCT2E]" },
{ 0x054c0bb5, "Headset MDR-1000X" },
{ 0x054c1000, "Wireless Buzz! Receiver" },
{ 0x054c1294, "Sony DCR-SR75" },
@@ -9458,6 +9560,12 @@ static const value_string usb_products_vals[] = {
{ 0x056a034b, "DTH-W1620 [MobileStudio Pro 16] touchscreen" },
{ 0x056a034d, "DTH-W1320 [MobileStudio Pro 13] tablet" },
{ 0x056a034e, "DTH-W1620 [MobileStudio Pro 16] tablet" },
+ { 0x056a034f, "DTH-1320 [Cintiq Pro 13] tablet" },
+ { 0x056a0350, "DTH-1620 [Cintiq Pro 16] tablet" },
+ { 0x056a0353, "DTH-1320 [Cintiq Pro 13] touchscreen" },
+ { 0x056a0354, "DTH-1620 [Cintiq Pro 16] touchscreen" },
+ { 0x056a0357, "PTH-660 [Intuos Pro (M)]" },
+ { 0x056a0358, "PTH-860 [Intuos Pro (L)]" },
{ 0x056a0400, "PenPartner 4x5" },
{ 0x056a4001, "TPC4001" },
{ 0x056a4004, "TPC4004" },
@@ -9588,7 +9696,7 @@ static const value_string usb_products_vals[] = {
{ 0x057c2000, "ISDN-Connector FRITZ!X" },
{ 0x057c2200, "BlueFRITZ!" },
{ 0x057c2300, "Teledat X130 DSL" },
- { 0x057c2800, "ISDN-Connector TA" },
+ { 0x057c2800, "Teledat 2a/b / X120 / NetXXL ISDN Terminal Adapter" },
{ 0x057c3200, "Teledat X130 DSL" },
{ 0x057c3500, "FRITZ!Card DSL SL" },
{ 0x057c3701, "FRITZ!Box SL" },
@@ -9596,7 +9704,7 @@ static const value_string usb_products_vals[] = {
{ 0x057c3800, "BlueFRITZ! Bluetooth Stick" },
{ 0x057c3a00, "FRITZ!Box Fon" },
{ 0x057c3c00, "FRITZ!Box WLAN" },
- { 0x057c3d00, "Fritz!Box" },
+ { 0x057c3d00, "FRITZ!Box Fon WLAN 7050/7140/7170/IAD3331" },
{ 0x057c3e01, "FRITZ!Box (Annex A)" },
{ 0x057c4001, "FRITZ!Box Fon (Annex A)" },
{ 0x057c4101, "FRITZ!Box WLAN (Annex A)" },
@@ -9615,6 +9723,8 @@ static const value_string usb_products_vals[] = {
{ 0x057c8501, "FRITZ WLAN N v2 [RT5572/rt2870.bin]" },
{ 0x057e0305, "Broadcom BCM2045A Bluetooth Radio [Nintendo Wii]" },
{ 0x057e0306, "Wii Remote Controller RVL-003" },
+ { 0x057e2006, "Joy-Con L" },
+ { 0x057e2007, "Joy-Con R" },
{ 0x057f6238, "USB StrikePad" },
{ 0x05820000, "UA-100(G)" },
{ 0x05820002, "UM-4/MPU-64 MIDI Interface" },
@@ -10027,6 +10137,7 @@ static const value_string usb_products_vals[] = {
{ 0x059f0525, "BigDisk Extreme 500" },
{ 0x059f0641, "Mobile Hard Drive" },
{ 0x059f0829, "BigDisk Extreme+" },
+ { 0x059f1004, "Little Disk 20 GB" },
{ 0x059f100c, "Rugged Triple Interface Mobile Hard Drive" },
{ 0x059f1010, "Desktop Hard Drive" },
{ 0x059f1016, "Desktop Hard Drive" },
@@ -10037,6 +10148,7 @@ static const value_string usb_products_vals[] = {
{ 0x059f102a, "Rikiki Hard Drive" },
{ 0x059f1049, "rikiki Harddrive" },
{ 0x059f1052, "P'9220 Mobile Drive" },
+ { 0x059f1061, "Rugged USB3-FW" },
{ 0x059f1064, "Rugged 16 and 32 GB" },
{ 0x059f106d, "Porsche Design Mobile Drive" },
{ 0x059f106e, "Porsche Design Desktop Drive" },
@@ -10610,6 +10722,7 @@ static const value_string usb_products_vals[] = {
{ 0x05dca811, "16GB Gizmo!" },
{ 0x05dca813, "16gB flash thumb drive" },
{ 0x05dca815, "JumpDrive V10" },
+ { 0x05dca81d, "LJDTT16G [JumpDrive 16GB]" },
{ 0x05dca833, "JumpDrive S23 64GB" },
{ 0x05dcb002, "USB CF Reader" },
{ 0x05dcb018, "Multi-Card Reader" },
@@ -10748,6 +10861,7 @@ static const value_string usb_products_vals[] = {
{ 0x05fa3302, "Keyboard" },
{ 0x05fa3303, "Keyboard with PS/2 Mouse Port" },
{ 0x05fc0001, "Soundcraft Si Multi Digital Card" },
+ { 0x05fc0010, "Soundcraft Si MADI combo card" },
{ 0x05fc7849, "Harman/Kardon SoundSticks" },
{ 0x05fd0239, "SV-239 HammerHead Digital" },
{ 0x05fd0251, "Raider Pro" },
@@ -10886,11 +11000,14 @@ static const value_string usb_products_vals[] = {
{ 0x064ef103, "Lenovo Integrated Webcam [R5U877]" },
{ 0x064ef209, "HP Webcam" },
{ 0x064ef300, "UVC 0.3M Webcam" },
- { 0x064f03e9, "CmStick (article no. 1001)" },
- { 0x064f03f2, "CmStick/M (article no. 1010)" },
- { 0x064f03f3, "CmStick/M (article no. 1011)" },
- { 0x064f0bd7, "BOX/U" },
- { 0x064f0bd8, "BOX/RU" },
+ { 0x064f03e9, "CmStick (MSD, article no. 1001-xx-xxx)" },
+ { 0x064f03f2, "CmStick/M (MSD, article no. 1010-xx-xxx)" },
+ { 0x064f03f3, "CmStick/M (MSD, article no. 1011-xx-xxx)" },
+ { 0x064f0bd7, "Wibu-Box/U (article no. 3031-xx-xxx)" },
+ { 0x064f0bd8, "Wibu-Box/RU (article no. 3032-xx-xxx)" },
+ { 0x064f2af9, "CmStick (HID, article no. 1001-xx-xxx)" },
+ { 0x064f2b03, "CmStick/M (HID, article no. 1011-xx-xxx)" },
+ { 0x064f5213, "CmStick/M (COMPOSITE, article no. 1011-xx-xxx)" },
{ 0x06540005, "Device Bay Controller" },
{ 0x06540006, "Hub" },
{ 0x06540007, "Device Bay Controller" },
@@ -11424,16 +11541,21 @@ static const value_string usb_products_vals[] = {
{ 0x06d3038c, "CP900DW(ID) Port" },
{ 0x06d30393, "CP9500D/DW Port" },
{ 0x06d30394, "CP9000D/DW Port" },
+ { 0x06d30398, "P93D" },
{ 0x06d303a1, "CP9550D/DW Port" },
{ 0x06d303a5, "CP9550DW-S" },
{ 0x06d303a9, "CP-9600DW" },
{ 0x06d303aa, "CP3020DA" },
- { 0x06d303ad, "CP-9800DW-S" },
+ { 0x06d303ad, "CP-9800D/DW" },
{ 0x06d303ae, "CP-9800DW-S" },
{ 0x06d321ba, "FOMA D905i" },
{ 0x06d33b10, "P95D" },
+ { 0x06d33b21, "CP-9810D/DW" },
{ 0x06d33b30, "CP-D70DW / CP-D707DW" },
{ 0x06d33b31, "CP-K60DW-S" },
+ { 0x06d33b36, "CP-D80DW" },
+ { 0x06d33b50, "CP-W5000DW" },
+ { 0x06d33b60, "CP-D90DW" },
{ 0x06d54000, "Japanese Keyboard" },
{ 0x06d60025, "Gamepad" },
{ 0x06d60026, "Predator TH 400 Gamepad" },
@@ -11640,6 +11762,7 @@ static const value_string usb_products_vals[] = {
{ 0x071d1003, "Diva ISDN 2.0" },
{ 0x071d1005, "Diva ISDN 4.0 [HFC-S]" },
{ 0x071d2000, "Teledat Surf" },
+ { 0x07208001, "LJ-V7001" },
{ 0x07230002, "Palladia 300/400 Adsl Modem" },
{ 0x07291000, "USC-1000 Serial Port" },
{ 0x072f0001, "AC1030-based SmartCard Reader" },
@@ -12183,7 +12306,7 @@ static const value_string usb_products_vals[] = {
{ 0x07b84104, "XX9" },
{ 0x07b8420a, "UF200 Ethernet" },
{ 0x07b85301, "GW-US54ZGL 802.11bg" },
- { 0x07b86001, "802.11bg" },
+ { 0x07b86001, "WUG2690 802.11bg Wireless Module [ZyDAS ZD1211+AL2230]" },
{ 0x07b88188, "AboCom Systems Inc [WN2001 Prolink Wireless-N Nano Adapter]" },
{ 0x07b8a001, "WUG2200 802.11g Wireless Adapter [Envara WiND512]" },
{ 0x07b8abc1, "DU-E10 Ethernet [pegasus]" },
@@ -12468,6 +12591,7 @@ static const value_string usb_products_vals[] = {
{ 0x08100001, "Dual PSX Adaptor" },
{ 0x08100002, "Dual PCS Adaptor" },
{ 0x08100003, "PlayStation Gamepad" },
+ { 0x0810e001, "Twin controller" },
{ 0x0810e501, "SNES Gamepad" },
{ 0x08130001, "Intel Play QX3 Microscope" },
{ 0x08130002, "Dual Mode Camera Plus" },
@@ -12619,6 +12743,7 @@ static const value_string usb_products_vals[] = {
{ 0x08469042, "On Networks N150MA 802.11bgn [Realtek RTL8188CUS]" },
{ 0x08469043, "WNA1000Mv2 802.11bgn [Realtek RTL8188CUS?]" },
{ 0x08469050, "A6200 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]" },
+ { 0x08469051, "A6200v2 802.11a/b/g/n/ac (2x2) Wireless Adapter [Realtek RTL8812AU]" },
{ 0x08469052, "A6100 AC600 DB Wireless Adapter [Realtek RTL8811AU]" },
{ 0x0846a001, "PA101 10 Mbps HPNA Home Phoneline RJ-1" },
{ 0x0846f001, "On Networks N300MA 802.11bgn [Realtek RTL8192CU]" },
@@ -12721,7 +12846,10 @@ static const value_string usb_products_vals[] = {
{ 0x088e5036, "Portable secure storage for software licenses" },
{ 0x08920101, "Smartdio Reader/Writer" },
{ 0x08940010, "Remote NDIS Network Device" },
+ { 0x08970001, "ICE In-Circuit Emulator" },
{ 0x08970002, "Power Debug/Power Debug II" },
+ { 0x08970004, "PowerDebug" },
+ { 0x08970005, "PowerDebug PRO" },
{ 0x08a60051, "B-SV4" },
{ 0x08a90005, "USBee ZX" },
{ 0x08a90009, "USBee SX" },
@@ -12984,6 +13112,8 @@ static const value_string usb_products_vals[] = {
{ 0x090801fe, "SIMATIC NET PC Adapter A2" },
{ 0x090804b1, "MediSET" },
{ 0x090804b2, "NC interface" },
+ { 0x090804b3, "keyboard front panel Cockpit" },
+ { 0x090804b4, "SCR_CCID" },
{ 0x09082701, "ShenZhen SANZHAI Technology Co.,Ltd Spy Pen VGA" },
{ 0x090a1001, "T33520 Flash Card Controller" },
{ 0x090a1100, "Comotron C3310 MP3 player" },
@@ -13135,6 +13265,7 @@ static const value_string usb_products_vals[] = {
{ 0x09300963, "Toshiba Excite AT300" },
{ 0x09300a07, "WLM-10U1 802.11abgn Wireless Adapter [Ralink RT3572]" },
{ 0x09300a08, "WLM-20U2/GN-1080 802.11abgn Wireless Adapter [Atheros AR7010+AR9280]" },
+ { 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" },
@@ -13273,6 +13404,7 @@ static const value_string usb_products_vals[] = {
{ 0x09511624, "DataTraveler G2" },
{ 0x09511625, "DataTraveler 101 II" },
{ 0x0951162a, "DataTraveler 112 4GB Pen Drive" },
+ { 0x0951162b, "DataTraveler HyperX 3.0" },
{ 0x0951162d, "DataTraveler 102" },
{ 0x09511630, "DataTraveler 200 (32GB)" },
{ 0x09511642, "DT101 G2" },
@@ -13285,12 +13417,16 @@ 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)" },
+ { 0x09557018, "T186 [Tegra Parker]" },
+ { 0x0955701a, "U-Boot running on Tegra" },
+ { 0x09557020, "L4T (Linux for Tegra) running on Tegra" },
+ { 0x09557030, "T30 [Tegra 3] recovery mode" },
{ 0x095570a9, "nVidia CM9-Adam" },
{ 0x09557100, "Tegra Device" },
+ { 0x09557140, "T124 [Tegra K1/Logan 32-bit]" },
{ 0x09557210, "SHIELD Controller" },
- { 0x09557820, "Tegra 2 AC100 developer mode" },
+ { 0x09557721, "T210 [Tegra Erista]" },
+ { 0x09557820, "T20 [Tegra 2] recovery mode" },
{ 0x0955b400, "SHIELD (debug)" },
{ 0x0955b401, "SHIELD" },
{ 0x0955cf05, "SHIELD Tablet (debug)" },
@@ -13612,10 +13748,14 @@ static const value_string usb_products_vals[] = {
{ 0x0a5c5804, "BCM5880 Secure Applications Processor with fingerprint swipe sensor" },
{ 0x0a5c6300, "Pirelli Remote NDIS Device" },
{ 0x0a5c6410, "BCM20703A1 Bluetooth 4.1 + LE" },
- { 0x0a5cbd11, "TiVo AG0100 802.11bg Wireless Adapter [Broadcom BCM4320]" },
+ { 0x0a5cbd11, "BCM4320 802.11bg Wireless Adapter" },
+ { 0x0a5cbd12, "BCM4326U 802.11bg Wireless Adapter" },
{ 0x0a5cbd13, "BCM4323 802.11abgn Wireless Adapter" },
{ 0x0a5cbd16, "BCM4319 802.11bgn Wireless Adapter" },
{ 0x0a5cbd17, "BCM43236 802.11abgn Wireless Adapter" },
+ { 0x0a5cbd1d, "BCM43526 802.11a/b/g/n/ac (2x2) Wireless Adapter" },
+ { 0x0a5cbd1e, "BCM43143 802.11bgn (1x1) Wireless Adapter" },
+ { 0x0a5cbd1f, "BCM43242 802.11abgn Wireless Adapter" },
{ 0x0a5cd11b, "Eminent EM4045 [Broadcom 4320 USB]" },
{ 0x0a5f0009, "LP2844 Printer" },
{ 0x0a5f0081, "GK420t Label Printer" },
@@ -13843,12 +13983,13 @@ static const value_string usb_products_vals[] = {
{ 0x0af90011, "Micro Innovations IC50C Webcam" },
{ 0x0afa07d2, "Controller Board for Projected Capacitive Touch Screen DUS3000" },
{ 0x0b050001, "MeMO Pad HD 7 (CD-ROM mode)" },
+ { 0x0b050301, "MyPal A696 GPS PDA" },
{ 0x0b051101, "Mass Storage (UISDMC4S)" },
{ 0x0b051706, "WL-167G v1 802.11g Adapter [Ralink RT2571]" },
{ 0x0b051707, "WL-167G v1 802.11g Adapter [Ralink RT2571]" },
{ 0x0b051708, "Mass Storage Device" },
{ 0x0b05170b, "Multi card reader" },
- { 0x0b05170c, "WL-159g 802.11bg" },
+ { 0x0b05170c, "WL-159g 802.11bg [ZyDAS ZD1211B+AL2230]" },
{ 0x0b05170d, "802.11b/g Wireless Network Adapter" },
{ 0x0b051712, "BT-183 Bluetooth 2.0+EDR adapter" },
{ 0x0b051715, "2045 Bluetooth 2.0 Device with trace filter" },
@@ -13860,11 +14001,11 @@ static const value_string usb_products_vals[] = {
{ 0x0b051723, "WL-167G v2 802.11g Adapter [Ralink RT2571W]" },
{ 0x0b051724, "RT2573" },
{ 0x0b051726, "Laptop OLED Display" },
- { 0x0b05172a, "ASUS 802.11n Network Adapter" },
+ { 0x0b05172a, "802.11n Network Adapter" },
{ 0x0b05172b, "802.11n Network Adapter" },
{ 0x0b051731, "802.11n Network Adapter" },
{ 0x0b051732, "802.11n Network Adapter" },
- { 0x0b051734, "ASUS AF-200" },
+ { 0x0b051734, "AF-200" },
{ 0x0b05173c, "BT-183 Bluetooth 2.0" },
{ 0x0b05173f, "My Cinema U3100 Mini" },
{ 0x0b051742, "802.11n Network Adapter" },
@@ -13890,8 +14031,14 @@ static const value_string usb_products_vals[] = {
{ 0x0b0517c7, "WL-330NUL" },
{ 0x0b0517c9, "USB-AC53 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]" },
{ 0x0b0517cb, "Broadcom BCM20702A0 Bluetooth" },
- { 0x0b0517d1, "AC51 802.11a/b/g/n/ac Wireless Adapter [Mediatek MT7610/Ralink RT2870]" },
+ { 0x0b0517d1, "AC51 802.11a/b/g/n/ac Wireless Adapter [Mediatek MT7610U]" },
+ { 0x0b0517d2, "USB-AC56 802.11a/b/g/n/ac Wireless Adapter [Realtek RTL8812AU]" },
+ { 0x0b0517d3, "USB-N10 v2 802.11b/g/n Wireless Adapter [MediaTek MT7601U]" },
+ { 0x0b0517db, "USB-AC50 802.11a/b/g/n/ac (1x1) Wireless Adapter [MediaTek MT7610U]" },
+ { 0x0b0517e8, "USB-N14 802.11b/g/n (2x2) Wireless Adapter [Ralink RT5372]" },
+ { 0x0b0517eb, "USB-AC55 802.11a/b/g/n/ac Wireless Adapter [MediaTek MT7612U]" },
{ 0x0b05180a, "Broadcom BCM20702 Single-Chip Bluetooth 4.0 + LE" },
+ { 0x0b051817, "USB-AC68 802.11a/b/g/n/ac (4x4) Wireless Adapter [Realtek RTL8814AU]" },
{ 0x0b051825, "Qualcomm Bluetooth 4.1" },
{ 0x0b054c80, "Asus TF300 Transformer" },
{ 0x0b054c81, "Asus TF300 Transformer (USB debug mode)" },
@@ -13911,12 +14058,12 @@ static const value_string usb_products_vals[] = {
{ 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)" },
+ { 0x0b057772, "Zenfone GO (ZB500KL) (MTP mode)" },
+ { 0x0b057773, "Zenfone GO (ZB500KL) (Debug, MTP mode)" },
+ { 0x0b057774, "Zenfone GO (ZB500KL) (RNDIS mode)" },
+ { 0x0b057775, "Zenfone GO (ZB500KL) (Debug, RNDIS mode)" },
+ { 0x0b057776, "Zenfone GO (ZB500KL) (PTP mode)" },
+ { 0x0b057777, "Zenfone GO (ZB500KL) (Debug, PTP mode)" },
{ 0x0b05b700, "Broadcom Bluetooth 2.1" },
{ 0x0b0b106e, "Datamax E-4304" },
{ 0x0b0c0009, "Todos Argos Mini II Smart Card Reader" },
@@ -13943,6 +14090,7 @@ static const value_string usb_products_vals[] = {
{ 0x0b300006, "SM Media-Shuttle Card Reader" },
{ 0x0b330020, "ShuttleXpress" },
{ 0x0b330030, "ShuttlePro v2" },
+ { 0x0b330401, "RollerMouse Free 2" },
{ 0x0b330700, "RollerMouse Pro" },
{ 0x0b380003, "Keyboard" },
{ 0x0b380010, "107-Key Keyboard" },
@@ -14278,6 +14426,7 @@ static const value_string usb_products_vals[] = {
{ 0x0bc23101, "FreeAgent XTreme 640GB" },
{ 0x0bc23312, "SRD00F2 Expansion Desktop Drive (STBV)" },
{ 0x0bc23320, "SRD00F2 [Expansion Desktop Drive]" },
+ { 0x0bc23322, "SRD0NF2 [Expansion Desktop Drive]" },
{ 0x0bc23332, "Expansion" },
{ 0x0bc25020, "FreeAgent GoFlex" },
{ 0x0bc25021, "FreeAgent GoFlex USB 2.0" },
@@ -14290,14 +14439,18 @@ static const value_string usb_products_vals[] = {
{ 0x0bc250a5, "FreeAgent GoFlex Desk USB 3.0" },
{ 0x0bc25121, "FreeAgent GoFlex" },
{ 0x0bc25161, "FreeAgent GoFlex dock" },
+ { 0x0bc26126, "Maxtor D3 Station 5TB" },
+ { 0x0bc261b6, "Maxtor HX-M101TCB/GM [M3 Portable 1TB]" },
{ 0x0bc261b7, "Maxtor M3 Portable" },
{ 0x0bc2a003, "Backup Plus" },
{ 0x0bc2a0a1, "Backup Plus Desktop" },
{ 0x0bc2a0a4, "Backup Plus Desktop Drive" },
{ 0x0bc2ab00, "Slim Portable Drive" },
+ { 0x0bc2ab1e, "Backup Plus Portable Drive" },
{ 0x0bc2ab20, "Backup Plus Portable Drive" },
{ 0x0bc2ab21, "Backup Plus Slim" },
{ 0x0bc2ab24, "Backup Plus Portable Drive" },
+ { 0x0bc2ab26, "Backup Plus Slim Portable Drive 1 TB" },
{ 0x0bc2ab31, "Backup Plus Desktop Drive (5TB)" },
{ 0x0bc2ab34, "Backup Plus" },
{ 0x0bc2ab38, "Backup Plus Hub" },
@@ -14352,6 +14505,7 @@ static const value_string usb_products_vals[] = {
{ 0x0bda0186, "Card Reader" },
{ 0x0bda0301, "multicard reader" },
{ 0x0bda0307, "Card Reader" },
+ { 0x0bda0326, "Card reader" },
{ 0x0bda1724, "RTL8723AU 802.11n WLAN Adapter" },
{ 0x0bda2831, "RTL2831U DVB-T" },
{ 0x0bda2832, "RTL2832U DVB-T" },
@@ -14363,6 +14517,7 @@ static const value_string usb_products_vals[] = {
{ 0x0bda5775, "HP \"Truevision HD\" laptop camera" },
{ 0x0bda57b3, "Acer 640 \\xc3\\x97 480 laptop camera" },
{ 0x0bda57da, "Built-In Video Camera" },
+ { 0x0bda58c8, "Integrated Webcam HD" },
{ 0x0bda8150, "RTL8150 Fast Ethernet Adapter" },
{ 0x0bda8151, "RTL8151 Adapteon Business Mobile Networks BV" },
{ 0x0bda8152, "RTL8152 Fast Ethernet Adapter" },
@@ -14376,13 +14531,15 @@ static const value_string usb_products_vals[] = {
{ 0x0bda817f, "RTL8188RU 802.11n WLAN Adapter" },
{ 0x0bda8187, "RTL8187 Wireless Adapter" },
{ 0x0bda8189, "RTL8187B Wireless 802.11g 54Mbps Network Adapter" },
- { 0x0bda818b, "ACT-WNP-UA-005 802.11b/g/n WLAN Adapter" },
+ { 0x0bda818b, "RTL8192EU 802.11b/g/n WLAN Adapter" },
{ 0x0bda8192, "RTL8191SU 802.11n Wireless Adapter" },
{ 0x0bda8193, "RTL8192DU 802.11an WLAN Adapter" },
{ 0x0bda8197, "RTL8187B Wireless Adapter" },
{ 0x0bda8198, "RTL8187B Wireless Adapter" },
{ 0x0bda8199, "RTL8187SU 802.11g WLAN Adapter" },
- { 0x0bda8812, "RTL8812AU 802.11a/b/g/n/ac WLAN Adapter" },
+ { 0x0bda8812, "RTL8812AU 802.11a/b/g/n/ac 2T2R DB WLAN Adapter" },
+ { 0x0bda8813, "RTL8814AU 802.11a/b/g/n/ac Wireless Adapter" },
+ { 0x0bdaa811, "RTL8811AU 802.11a/b/g/n/ac WLAN Adapter" },
{ 0x0bdb1000, "BV Bluetooth Device" },
{ 0x0bdb1002, "Bluetooth Device 1.2" },
{ 0x0bdb1049, "C3607w Mobile Broadband Module" },
@@ -14473,6 +14630,7 @@ static const value_string usb_products_vals[] = {
{ 0x0c2e0b61, "Vuquest 3310g" },
{ 0x0c2e0b6a, "Vuquest 3310 Area-Imaging Scanner" },
{ 0x0c2e0b81, "Barcode scanner Voyager 1400g Series" },
+ { 0x0c306010, "Kona 1400 Cutting Plotter" },
{ 0x0c440021, "iDEN P2k0 Device" },
{ 0x0c440022, "iDEN P2k1 Device" },
{ 0x0c4403a2, "iDEN Smartphone" },
@@ -14609,6 +14767,7 @@ static const value_string usb_products_vals[] = {
{ 0x0c456417, "Integrated Webcam" },
{ 0x0c456419, "Integrated Webcam" },
{ 0x0c45641d, "1.3 MPixel Integrated Webcam" },
+ { 0x0c456433, "Laptop Integrated Webcam HD (Composite Device)" },
{ 0x0c45643f, "Dell Integrated HD Webcam" },
{ 0x0c45644d, "1.3 MPixel Integrated Webcam" },
{ 0x0c456480, "Sonix 1.3 MP Laptop Integrated Webcam" },
@@ -14738,6 +14897,7 @@ static const value_string usb_products_vals[] = {
{ 0x0ca62010, "myPad110 PC/SC Smart Card Reader" },
{ 0x0ca63050, "EZ710 Smart Card Reader" },
{ 0x0cad1007, "APX Series Consolette" },
+ { 0x0cad1020, "MOTOTRBO Series Radio (Portable)" },
{ 0x0cad1030, "APX Series Radio (Portable)" },
{ 0x0cad1031, "APX Series Radio (Mobile)" },
{ 0x0cad1602, "IMPRES Battery Data Reader" },
@@ -14885,7 +15045,7 @@ static const value_string usb_products_vals[] = {
{ 0x0d160104, "Photo Printer 63xPL/PS" },
{ 0x0d160105, "Photo Printer 64xPS" },
{ 0x0d160200, "Photo Printer 64xDL" },
- { 0x0d280204, "LPC1768" },
+ { 0x0d280204, "ARM mbed" },
{ 0x0d3a0206, "Series 3xxx Cash Drawer" },
{ 0x0d3a0207, "Series 3xxx Cash Drawer" },
{ 0x0d3a0500, "Magnetic Stripe Reader" },
@@ -14893,6 +15053,7 @@ static const value_string usb_products_vals[] = {
{ 0x0d3d0040, "PS/2 Adapter" },
{ 0x0d462012, "KAAN Standard Plus (Smartcard reader)" },
{ 0x0d463003, "mIDentity Light / KAAN SIM III" },
+ { 0x0d463014, "Smart Token" },
{ 0x0d464000, "mIDentity (mass storage)" },
{ 0x0d464001, "mIDentity Basic/Classic (composite device)" },
{ 0x0d464081, "mIDentity Basic/Classic (installationless)" },
@@ -14944,6 +15105,7 @@ static const value_string usb_products_vals[] = {
{ 0x0d642208, "Mass Storage" },
{ 0x0d643105, "Dual Mode Digital Camera Disk" },
{ 0x0d643108, "Digicam Mass Storage Device" },
+ { 0x0d645566, "Contour Roam Model 1600" },
{ 0x0d7a0001, "CrypToken" },
{ 0x0d7d0100, "PS1001/1011/1006/1026 Flash Disk" },
{ 0x0d7d0110, "Gigabyte FlexDrive" },
@@ -14968,6 +15130,7 @@ static const value_string usb_products_vals[] = {
{ 0x0d8c0001, "Audio Device" },
{ 0x0d8c0002, "Composite Device" },
{ 0x0d8c0003, "Sound Device" },
+ { 0x0d8c0005, "Blue Snowball" },
{ 0x0d8c0006, "Storm HP-USB500 5.1 Headset" },
{ 0x0d8c000c, "Audio Adapter" },
{ 0x0d8c000d, "Composite Device" },
@@ -15057,6 +15220,8 @@ static const value_string usb_products_vals[] = {
{ 0x0db01967, "Bluetooth Dongle" },
{ 0x0db03713, "Primo 73" },
{ 0x0db03801, "Motorola Bluetooth 2.1+EDR Device" },
+ { 0x0db03870, "MS-3870 802.11bgn Wireless Module [Ralink RT3070]" },
+ { 0x0db03871, "MS-3871 802.11bgn Wireless Module [Ralink RT8070]" },
{ 0x0db04011, "Medion Flash XL V2.0 Card Reader" },
{ 0x0db04023, "Lexar Mobile Card Reader" },
{ 0x0db04600, "802.11b/g Turbo Wireless Adapter" },
@@ -15286,6 +15451,7 @@ static const value_string usb_products_vals[] = {
{ 0x0e4c1097, "Gamester Controller" },
{ 0x0e4c2390, "Games Jtech Controller" },
{ 0x0e4c7288, "funkey reader" },
+ { 0x0e500001, "Matrix USB-Key" },
{ 0x0e500002, "Matrixlock Dongle (HID)" },
{ 0x0e55110a, "Tanic S110-SG1 + ISSC IS1002N [Slow Infra-Red (SIR) & Bluetooth 1.2 (Class 2) Adapter]" },
{ 0x0e55110b, "MS3303H USB-to-Serial Bridge" },
@@ -15309,6 +15475,7 @@ static const value_string usb_products_vals[] = {
{ 0x0e6a030b, "Truly Ergonomic Computer Keyboard (Device Firmware Update mode)" },
{ 0x0e6a030c, "Truly Ergonomic Computer Keyboard" },
{ 0x0e6a6001, "GEMBIRD Flexible keyboard KB-109F-B-DE" },
+ { 0x0e6a7f5c, "BPF-015 Key Chain Photo Frame" },
{ 0x0e6f0003, "Freebird wireless Controller" },
{ 0x0e6f0005, "Eclipse wireless Controller" },
{ 0x0e6f0006, "Edge wireless Controller" },
@@ -15376,6 +15543,7 @@ static const value_string usb_products_vals[] = {
{ 0x0e8f0021, "Multimedia Keyboard Controller" },
{ 0x0e8f0022, "multimedia keyboard controller" },
{ 0x0e8f0201, "SmartJoy Frag Xpad/PS2 adaptor" },
+ { 0x0e8f300a, "steering Wheel" },
{ 0x0e900100, "Storage Adapter V1" },
{ 0x0e96c001, "TRUST 380 USB2 SPACEC@M" },
{ 0x0e970908, "Composite HID (Keyboard and Mouse)" },
@@ -15909,12 +16077,18 @@ static const value_string usb_products_vals[] = {
{ 0x10582599, "My Passport Ultra (WD40NMZW)" },
{ 0x1058259d, "My Passport Ultra (WDBBKD)" },
{ 0x1058259f, "My Passport Ultra (WD10JMVW)" },
+ { 0x105825a1, "Elements / My Passport (WD20NMVW)" },
+ { 0x105825a2, "Elements 25A2" },
+ { 0x105825a3, "Elements Desktop (WDBWLG)" },
+ { 0x105825e2, "My Passport (WD40NMZW)" },
+ { 0x105830a0, "SATA adapter cable" },
{ 0x1059000b, "StarSign Bio Token 3.0" },
{ 0x105be065, "BCM43142A0 Bluetooth module" },
{ 0x10631555, "MC141555 Hub" },
{ 0x10634100, "SB4100 USB Cable Modem" },
{ 0x10650020, "USB-DVR2 Dev Board" },
{ 0x10652136, "EasyDisk ED1064" },
+ { 0x10680001, "CPUSB - V 1.8 - software-rights management key" },
{ 0x106c1101, "CDMA 2000 1xRTT USB modem (HX-550C)" },
{ 0x106c1102, "Packet Service" },
{ 0x106c1103, "Packet Service Diagnostic Serial Port (WDM)" },
@@ -15994,9 +16168,39 @@ static const value_string usb_products_vals[] = {
{ 0x107b3009, "eHome Infrared Transceiver" },
{ 0x107b55b2, "WBU-110 802.11b Wireless Adapter [Intersil PRISM 3]" },
{ 0x107b55f2, "WGU-210 802.11g Adapter [Intersil ISL3886]" },
+ { 0x1083160c, "CR-55" },
+ { 0x1083160f, "DR-1210C" },
+ { 0x10831614, "DR-4010C" },
+ { 0x10831617, "DR-2510C" },
+ { 0x10831618, "DR-X10C" },
+ { 0x1083161a, "CR-25" },
{ 0x1083161b, "DR-2010C Scanner" },
+ { 0x1083161d, "DR-3010C" },
+ { 0x10831620, "DR-7090C" },
+ { 0x10831622, "DR-9050C" },
+ { 0x10831623, "DR-7550C" },
+ { 0x10831624, "DR-6050C" },
+ { 0x10831626, "DR-6010C" },
{ 0x1083162c, "P-150 Scanner" },
+ { 0x10831638, "DR-6030C" },
+ { 0x10831639, "CR-135i" },
+ { 0x1083163e, "DR-M160" },
+ { 0x1083163f, "DR-M140" },
+ { 0x10831640, "DR-C125" },
+ { 0x10831641, "DR-P215" },
+ { 0x10831648, "FSU-201" },
+ { 0x1083164a, "DR-C130" },
+ { 0x1083164b, "DR-P208" },
+ { 0x1083164f, "DR-G1130" },
+ { 0x10831650, "DR-G1100" },
+ { 0x10831651, "DR-C120" },
+ { 0x10831654, "DR-F120" },
+ { 0x10831657, "DR-M1060" },
+ { 0x10831658, "DR-C225" },
+ { 0x10831659, "DR-P215II" },
+ { 0x1083165d, "DR-P208II" },
{ 0x108b0005, "HID Keyboard/Mouse PS/2 Translator" },
+ { 0x10918101, "Absoflex" },
{ 0x109b9118, "Medion P4013 Mobile" },
{ 0x109f3163, "Trigem Mobile SmartDisplay84" },
{ 0x109f3164, "Trigem Mobile SmartDisplay121" },
@@ -16049,20 +16253,23 @@ static const value_string usb_products_vals[] = {
{ 0x10af0007, "Nfinity Power Systems UPS" },
{ 0x10af0008, "PowerSure Interactive UPS" },
{ 0x10b59060, "Test Board" },
- { 0x10b80bb8, "DiBcom USB DVB-T reference design (MOD300) (cold)" },
- { 0x10b80bb9, "DiBcom USB DVB-T reference design (MOD300) (warm)" },
- { 0x10b80bc6, "DiBcom USB2.0 DVB-T reference design (MOD3000P) (cold)" },
- { 0x10b80bc7, "DiBcom USB2.0 DVB-T reference design (MOD3000P) (warm)" },
+ { 0x10b80bb8, "DVB-T reference design (MOD300) (cold)" },
+ { 0x10b80bb9, "DVB-T reference design (MOD300) (warm)" },
+ { 0x10b80bc6, "DVB-T reference design (MOD3000P) (cold)" },
+ { 0x10b80bc7, "DVB-T reference design (MOD3000P) (warm)" },
{ 0x10bd1427, "Ethernet" },
{ 0x10bf0001, "SmartHome PowerLinc" },
{ 0x10c300a4, "ULS PLS Series Laser Engraver Firmware Loader" },
{ 0x10c300a5, "ULS Print Support" },
{ 0x10c40002, "F32x USBXpress Device" },
{ 0x10c40003, "CommandIR" },
+ { 0x10c4800a, "SPORTident" },
+ { 0x10c4800b, "AES" },
{ 0x10c48030, "K4JRG Ham Radio devices" },
{ 0x10c48044, "USB Debug Adapter" },
{ 0x10c4804e, "Software Bisque Paramount ME" },
{ 0x10c480a9, "CP210x to UART Bridge Controller" },
+ { 0x10c480c4, "Infrared Thermometer Adapter" },
{ 0x10c480ca, "ATM2400 Sensor Device" },
{ 0x10c4813f, "tams EasyControl" },
{ 0x10c48149, "West Mountain Radio Computerized Battery Analyzer" },
@@ -16070,27 +16277,41 @@ static const value_string usb_products_vals[] = {
{ 0x10c4814b, "West Mountain Radio RIGtalk" },
{ 0x10c4818a, "Silicon Labs FM Radio Reference Design" },
{ 0x10c481e8, "Zephyr BioHarness" },
+ { 0x10c4834b, "Infrared Online Sensor Adapter" },
+ { 0x10c4834e, "Infrared Sensor Adapter" },
{ 0x10c48460, "Sangoma Wanpipe VoiceTime" },
{ 0x10c48461, "Sangoma U100" },
+ { 0x10c48470, "Juniper Networks BX Series System Console" },
{ 0x10c48477, "Balluff RFID Reader" },
{ 0x10c48496, "SiLabs Cypress FW downloader" },
{ 0x10c48497, "SiLabs Cypress EVB" },
+ { 0x10c484fb, "Infrared Blackbody Adapter" },
+ { 0x10c48508, "RS485 Adapter" },
{ 0x10c48605, "dilitronics ESoLUX solar lighting controller" },
+ { 0x10c48660, "Netronics CANdoISO" },
{ 0x10c486bc, "C8051F34x AudioDelay [AD-340]" },
{ 0x10c48789, "C8051F34x Extender & EDID MGR [EMX-DVI]" },
{ 0x10c487be, "C8051F34x HDMI Audio Extractor [EMX-HD-AUD]" },
{ 0x10c48863, "C8051F34x Bootloader" },
{ 0x10c48897, "C8051F38x HDMI Splitter [UHBX]" },
+ { 0x10c488c9, "AES HID device" },
{ 0x10c48918, "C8051F38x HDMI Audio Extractor [VSA-HA-DP]" },
{ 0x10c48973, "C8051F38x HDMI Extender [UHBX-8X]" },
+ { 0x10c489c6, "SPORTident HID device" },
{ 0x10c489e1, "C8051F38x HDMI Extender [UHBX-SW3-WP]" },
- { 0x10c4ea60, "CP210x UART Bridge / myAVR mySmartUSB light" },
+ { 0x10c4ea60, "CP2102/CP2109 UART Bridge Controller [CP210x family]" },
{ 0x10c4ea61, "CP210x UART Bridge" },
{ 0x10c4ea70, "CP210x UART Bridge" },
{ 0x10c4ea80, "CP210x UART Bridge" },
+ { 0x10c4eac9, "EFM8UB1 Bootloader" },
+ { 0x10c4eaca, "EFM8UB2 Bootloader" },
{ 0x10c5819a, "FM Radio" },
{ 0x10cc1101, "MP3 Player" },
+ { 0x10ce0007, "Shinko/Sinfonia CHC-S1245" },
{ 0x10ce000e, "Shinko/Sinfonia CHC-S2145" },
+ { 0x10ce0019, "Shinko/Sinfonia CHC-S6145" },
+ { 0x10ce001d, "Shinko/Sinfonia CHC-S6245" },
+ { 0x10ce001e, "Ciaat Brava 21" },
{ 0x10ceea6a, "MobiData EDGE USB Modem" },
{ 0x10cf2011, "R-Engine MPEG2 encoder/decoder" },
{ 0x10cf5500, "8055 Experiment Interface Board (address=0)" },
@@ -16119,6 +16340,7 @@ static const value_string usb_products_vals[] = {
{ 0x10f11a08, "Internal Webcam" },
{ 0x10f11a1e, "Laptop Integrated Webcam 1.3M" },
{ 0x10f11a2a, "Laptop Integrated Webcam" },
+ { 0x10f11a2e, "HP Truevision HD Integrated Webcam" },
{ 0x10f50200, "Audio Advantage Roadie" },
{ 0x10fd7e50, "FlyCam Usb 100" },
{ 0x10fd804d, "Typhoon Webshot II Webcam [zc0301]" },
@@ -16157,6 +16379,7 @@ static const value_string usb_products_vals[] = {
{ 0x11300202, "Rocket Launcher" },
{ 0x11306604, "MCE IR-Receiver" },
{ 0x1130660c, "Foot Pedal/Thermometer" },
+ { 0x11306626, "Key" },
{ 0x11306806, "Keychain photo frame" },
{ 0x1130c301, "Digital Photo viewer [Wallet Pix]" },
{ 0x1130f211, "TP6911 Audio Headset" },
@@ -16172,6 +16395,8 @@ static const value_string usb_products_vals[] = {
{ 0x11324337, "PDR-M11" },
{ 0x11324338, "PDR-M25" },
{ 0x11363131, "CTS LS515" },
+ { 0x113f1020, "Watson Two-Finger Roll Scanner" },
+ { 0x113f1100, "Columbo Single-Finger Scanner" },
{ 0x11420709, "Cyberview High Speed Scanner" },
{ 0x11450001, "AirH PHONE AH-J3001V/J3002V" },
{ 0x114b0110, "Turbolink UB801R WLAN Adapter" },
@@ -16238,6 +16463,7 @@ static const value_string usb_products_vals[] = {
{ 0x11999008, "Gobi 2000 Wireless Modem" },
{ 0x11999009, "Gobi 2000 Wireless Modem" },
{ 0x1199900a, "Gobi 2000 Wireless Modem" },
+ { 0x11999013, "Sierra Wireless Gobi 3000 Modem device (MC8355)" },
{ 0x11999055, "Gobi 9x15 Multimode 3G/4G LTE Modem (NAT mode)" },
{ 0x11999057, "Gobi 9x15 Multimode 3G/4G LTE Modem (IP passthrough mode)" },
{ 0x119b0400, "Infrared Keyboard V2.01" },
@@ -16248,6 +16474,7 @@ static const value_string usb_products_vals[] = {
{ 0x11ac6565, "FuelBand" },
{ 0x11b06208, "PRO-28U" },
{ 0x11bef0a0, "Martin Maxxyz DMX" },
+ { 0x11c05506, "Gamepad" },
{ 0x11c50521, "IMT-0521 Smartcard Reader" },
{ 0x11ca0207, "PIN Pad VX 810" },
{ 0x11ca0220, "PIN Pad VX 805" },
@@ -16268,18 +16495,27 @@ static const value_string usb_products_vals[] = {
{ 0x12091004, "IBSecureCam-O" },
{ 0x12091005, "IBSecureCam-N" },
{ 0x12091006, "Mini IO-Board" },
+ { 0x12091ab5, "Arachnid Labs Tsunami" },
{ 0x12092000, "Zygmunt Krynicki Lantern Brightness Sensor" },
{ 0x12092048, "Housedillon.com MRF49XA Transciever" },
{ 0x12092222, "LabConnect Signalgenerator" },
{ 0x12092300, "Keyboardio Keyboardio Model 01 Bootloader" },
{ 0x12092301, "Keyboardio Keyboardio Model 01" },
+ { 0x12092327, "K.T.E.C.Bootloader Device" },
+ { 0x12092328, "K.T.E.C. Keyboard Device" },
{ 0x12092337, "/Dev or SlashDev /Net" },
{ 0x12093000, "lloyd3000" },
{ 0x12093333, "LabConnect Digitalnetzteil" },
{ 0x12095222, "telavivmakers attami" },
+ { 0x120953c0, "SatoshiLabs TREZOR Bootloader" },
+ { 0x120953c1, "SatoshiLabs TREZOR" },
{ 0x12095a22, "ikari_01 sd2snes" },
+ { 0x12097530, "Refflion - IoT Board - Bootloader" },
+ { 0x12097531, "Refflion - IoT Board - Sketch" },
{ 0x12097bd0, "pokey9000 Tiny Bit Dingus" },
{ 0x1209abd0, "tibounise ADB converter" },
+ { 0x1209aced, "Open Lighting Project - Ja Rule Device" },
+ { 0x1209acee, "Open Lighting Project - Ja Rule Bootloader" },
{ 0x1209beef, "Modal MC-USB" },
{ 0x1209c0f5, "unethi PERswitch" },
{ 0x1209ca1c, "KnightOS Hub" },
@@ -16295,6 +16531,10 @@ static const value_string usb_products_vals[] = {
{ 0x1210001b, "RP155 Guitar Multi-Effects Processor" },
{ 0x1210001c, "RP255 Guitar Multi-Effects Processor" },
{ 0x121e3403, "Muzio JM250 Audio Player" },
+ { 0x1220000a, "Hall of Fame Reverb" },
+ { 0x1220002a, "Polytune" },
+ { 0x12200032, "Ditto X2 Looper" },
+ { 0x12200039, "Alter Ego X4 Vintage Echo" },
{ 0x12213234, "Disk (Thumb drive)" },
{ 0x12280012, "Q18 Data Logger" },
{ 0x12280015, "TPaq21/MPaq21 Datalogger" },
@@ -16338,6 +16578,9 @@ static const value_string usb_products_vals[] = {
{ 0x12358010, "Forte" },
{ 0x12358012, "Scarlett 6i6" },
{ 0x12358014, "Scarlett 18i8" },
+ { 0x12358016, "Focusrite Scarlett 2i2" },
+ { 0x12358203, "Focusrite Scarlett 6i6" },
+ { 0x12358204, "Scarlett 18i8 2nd Gen" },
{ 0x12410504, "Wireless Trackball Keyboard" },
{ 0x12411111, "Mouse" },
{ 0x12411122, "Typhoon Stream Optical Mouse USB+PS/2" },
@@ -16364,10 +16607,11 @@ static const value_string usb_products_vals[] = {
{ 0x125fc93a, "4GB Pen Drive" },
{ 0x125fc96a, "C906 Flash Drive" },
{ 0x125fcb10, "Dash Drive UV100" },
+ { 0x125fcb20, "DashDrive UV110" },
{ 0x1260ee22, "SMC2862W-G v3 EZ Connect 802.11g Adapter [Intersil ISL3887]" },
{ 0x12666302, "Fastweb DRG A226M ADSL Router" },
{ 0x12670103, "G-720 Keyboard" },
- { 0x12670201, "A4Tech SWOP-3 Mouse" },
+ { 0x12670201, "Mouse" },
{ 0x12670210, "LG Optical Mouse 3D-310" },
{ 0x1267a001, "JP260 PC Game Pad" },
{ 0x1267c002, "Wireless Optical Mouse" },
@@ -16408,28 +16652,35 @@ static const value_string usb_products_vals[] = {
{ 0x12861fab, "88W8338 [Libertas] 802.11g" },
{ 0x12862001, "88W8388 802.11a/b/g WLAN" },
{ 0x12862006, "88W8362 802.11n WLAN" },
+ { 0x1286203c, "K30326 802.11bgn Wireless Module [Marvell 88W8786U]" },
{ 0x12868001, "BLOB boot loader firmware" },
{ 0x12910010, "FDM 2xxx Flash-OFDM modem" },
{ 0x12910011, "LR7F06/LR7F14 Flash-OFDM modem" },
{ 0x12920258, "Creative Labs VoIP Blaster" },
+ { 0x12924154, "Retro Link Atari cable" },
{ 0x12930002, "F5U002 Parallel Port [uss720]" },
{ 0x12932101, "104-key keyboard" },
{ 0x12941320, "Webmail Notifier" },
+ { 0x1297020f, "DTU-215 Multi-Standard Modulator" },
{ 0x129b160b, "Siemens S30853-S1031-R351 802.11g Wireless Adapter [Atheros AR5523]" },
{ 0x129b160c, "Siemens S30853-S1038-R351 802.11g Wireless Adapter [Atheros AR5523]" },
{ 0x129b1666, "TG54USB 802.11bg" },
{ 0x129b1667, "802.11bg" },
{ 0x129b1828, "Gigaset USB Adapter 300" },
+ { 0x12ba0032, "Wireless Stereo Headset" },
+ { 0x12ba0042, "Wireless Stereo Headset" },
{ 0x12ba00ff, "Rocksmith Guitar Adapter" },
{ 0x12ba0100, "RedOctane Guitar for PlayStation(R)3" },
{ 0x12ba0120, "RedOctane Drum Kit for PlayStation(R)3" },
{ 0x12ba0200, "Harmonix Guitar for PlayStation(R)3" },
{ 0x12ba0210, "Harmonix Drum Kit for PlayStation(R)3" },
{ 0x12bdd012, "JPD Shockforce gamepad" },
+ { 0x12bdd015, "Generic 4-button NES USB Controller" },
{ 0x12c40006, "Teleprompter Two-button Hand Control (v1)" },
{ 0x12c40008, "Teleprompter Foot Control (v1)" },
{ 0x12cf0170, "Tt eSPORTS BLACK Gaming mouse" },
- { 0x12d11001, "E169/E620/E800 HSDPA Modem" },
+ { 0x12cf600b, "Cougar 600M Gaming Mouse" },
+ { 0x12d11001, "E161/E169/E620/E800 HSDPA Modem" },
{ 0x12d11003, "E220 HSDPA Modem / E230/E270/E870 HSDPA/HSUPA Modem" },
{ 0x12d11004, "E220 (bis)" },
{ 0x12d11009, "U120" },
@@ -16440,14 +16691,16 @@ static const value_string usb_products_vals[] = {
{ 0x12d11038, "Ideos (debug mode)" },
{ 0x12d11039, "Ideos (tethering mode)" },
{ 0x12d11051, "Huawei Honor U8860" },
+ { 0x12d11052, "MT7-L09" },
{ 0x12d11404, "EM770W miniPCI WCDMA Modem" },
{ 0x12d11406, "E1750" },
{ 0x12d1140b, "EC1260 Wireless Data Modem HSD USB Card" },
{ 0x12d1140c, "E180v" },
{ 0x12d11412, "EC168c" },
{ 0x12d11436, "Broadband stick" },
- { 0x12d11446, "Broadband stick (modem on)" },
+ { 0x12d11446, "HSPA modem" },
{ 0x12d11465, "K3765 HSPA" },
+ { 0x12d114ac, "E815" },
{ 0x12d114c3, "K5005 Vodafone LTE/UMTS/GSM Modem/Networkcard" },
{ 0x12d114c8, "K5005 Vodafone LTE/UMTS/GSM MOdem/Networkcard" },
{ 0x12d114c9, "K3770 3G Modem" },
@@ -16480,6 +16733,7 @@ static const value_string usb_products_vals[] = {
{ 0x12d80001, "Alea I True Random Number Generator" },
{ 0x12e60013, "Blofeld" },
{ 0x12ef0100, "Tapwave Handheld [Tapwave Zodiac]" },
+ { 0x12f2000a, "Braille embosser [SpotDot Emprint]" },
{ 0x12f71a00, "TD Classic 003B" },
{ 0x12f71e23, "TravelDrive 2007 Flash Drive" },
{ 0x12fd1001, "AWU2000b 802.11b Stick" },
@@ -16489,7 +16743,7 @@ static const value_string usb_products_vals[] = {
{ 0x13070163, "256MB/512MB/1GB Flash Drive" },
{ 0x13070165, "2GB/4GB/8GB Flash Drive" },
{ 0x13070190, "Ut190 8 GB Flash Drive with MicroSD reader" },
- { 0x13070310, "SD/MicroSD CardReader [hama]" },
+ { 0x13070310, "SD/MicroSD CardReader [hama]/IT1327E [Basic Line flash drive]" },
{ 0x13070330, "63-in-1 Multi-Card Reader/Writer" },
{ 0x13070361, "CR-75: 51-in-1 Card Reader/Writer [Sakar]" },
{ 0x13071169, "TS2GJF210 JetFlash 210 2GB" },
@@ -16513,8 +16767,12 @@ static const value_string usb_products_vals[] = {
{ 0x13138022, "PM320E Optical Power and Energy Meter" },
{ 0x13138030, "ER100 Extinction Ratio Meter" },
{ 0x13138070, "PM100D" },
+ { 0x13138072, "PM100USB Power and Energy Meter Interface" },
+ { 0x13138078, "PM100D Compact Power and Energy Meter Console" },
+ { 0x13138080, "CCS100 - Compact Spectrometer" },
{ 0x131d0155, "TrackIR 3 Pro Head Tracker" },
{ 0x131d0156, "TrackIR 4 Pro Head Tracker" },
+ { 0x131d0158, "TrackIR 5 Pro Head Tracker" },
{ 0x132a1502, "WiND 802.11abg / 802.11bg WLAN" },
{ 0x132b0000, "Dimage A2 Camera" },
{ 0x132b0001, "Konica-Minolta DiMAGE A2" },
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index fcf8b10632..42715470a8 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
PRIVATE ENTERPRISE NUMBERS
-(last updated 2017-06-18)
+(last updated 2017-06-23)
SMI Network Management Private Enterprise Codes:
@@ -11006,9 +11006,9 @@ Decimal
Wade Ju
wju&aptia.com
2750
- WaveCom Electronics Inc.
- Douglas Fast
- doug&sask.trlabs.ca
+ Vecima Networks Inc. (formerly 'WaveCom Electronics Inc.')
+ Laird Froese
+ external.registrations&vecima.com
2751
Globalcast Communications Inc.
Naveen Rastogi
@@ -38194,9 +38194,9 @@ Decimal
Inkon Kang
firefly&etri.re.kr
9560
- SECUi.COM Corporation
+ SECUI
Namsik Yoon
- carnival&secui.com
+ namsik.yoon&secui.com
9561
Netia Telekom S.A.
Piotr Roszatycki
@@ -98752,8 +98752,8 @@ Minas Gerais
alexander.pertsch&blue-elephant-systems.com
24796
Bundesärztekammer
- Georgios Raptis
- georgios.raptis&baek.de
+ Dirk Schladweiler
+ dirk.schladweiler&baek.de
24797
IMSEC GmbH
Daniel Lutz
@@ -109285,8 +109285,8 @@ Technischen Universität Dresden
boss&viasoft.com.ua
27427
Vecima Networks Inc.
- Ryan Thompson
- ryan.thompson&vecimanetworks.com
+ Laird Froese
+ external.registrations&vecima.com
27428
Intesys S.r.l.
Romano Rosponi
@@ -131641,7 +131641,7 @@ Decentralization / Helenic Public Administra
33015
Emilie Myers and Associates
Julian Myers
- julian&velodog.demon.co.uk
+ julian&emiliemyers.com
33016
Ajuntament de Barcelona
M Mercedes Mestre Antoli
@@ -184152,9 +184152,9 @@ Decentralization / Helenic Public Administra
lin ting
ting_lin&sinexcel.cn
46143
- Lazada Tech Hub
- Denis Barov
- denis.barov&lazada.com
+ Lazada South East Asia (formerly 'Lazada Tech Hub')
+ Lim Qi Kang
+ qikang.lim&lazada.com
46144
Schmidt & Co., (H.K.) Ltd. Taiwan Branch
James hsu
@@ -186721,8 +186721,8 @@ Decentralization / Helenic Public Administra
yamatsu.yutaka&cosmovision.co.jp
46785
Comark Communications LLC
- JEAN LABARRE
- jlabarre&comarktv.com
+ Jason Hwang
+ jhwang&comarktv.com
46786
blue-beam.de
Aaron Bulmahn
@@ -191225,8 +191225,8 @@ Decentralization / Helenic Public Administra
orbitel45&gmail.com
47911
TOC S.A.
- Carlos Altamirano
- ca&toc.cl
+ Ricardo Navarro
+ rn&toc.cl
47912
Radio Rentals Ltd
Brad Howson
@@ -196424,7 +196424,7 @@ Decentralization / Helenic Public Administra
Anthony de Broise
anthony&cr0bar.co.uk
49211
- HanseCom Gesellschaft für Informations- und Kommunikationsdienstleistungen mbH
+ DATAGROUP Operate IT GmbH (formerly 'HanseCom Gesellschaft für Informations- und Kommunikationsdienstleistungen mbH')
Clemens Christensen
clemens.christensen&operate-it.com
49212
@@ -200331,6 +200331,138 @@ Decentralization / Helenic Public Administra
Pattern Recognition and Inteligent Systems Laboratory
Fransisco Siles
prislab.soporte&gmail.com
+50188
+ zkpig123.org
+ Kevin Zhang
+ zkpig123&yahoo.com
+50189
+ anrobot
+ ZHANG XINNAN
+ 70331471&qq.com
+50190
+ CS Corporation
+ Tae Kun Ha
+ tgha&cs-holdings.com
+50191
+ Matra Mandiri Prima
+ Rommy Pardamean
+ rpardamean&mmp-group.co.id
+50192
+ SOGETEL srl
+ Stefano Aquino
+ fornitori&sogetel.it
+50193
+ ANA-U GmbH
+ Ewald Ulrich
+ register&ana-u.com
+50194
+ Deutscher Genossenschafts-Verlag eG
+ Harald Lukhaub
+ hlukhaub&dgverlag.de
+50195
+ Domo Tactical Communications (DTC) Ltd
+ Greg Hindley
+ greg.hindley&domotactical.com
+50196
+ Instituto de Física Gleb Wataghin - Unicamp
+ Ariel Luiz Malves
+ redes&ifi.unicamp.br
+50197
+ jedi solutions
+ Alex Jankuv
+ consultingjedi&gmail.com
+50198
+ Aplura, LLC
+ Dan Deighton
+ sysadmin-iana&aplura.com
+50199
+ Skogsbolaget Mats Broberg AB
+ Mats Broberg
+ mats&matsbroberg.se
+50200
+ yellowshelf
+ PEN Admin
+ pen.admin&yellowshelf.com
+50201
+ Cubic Telecom
+ Frank Monahan
+ FrankM&Cubictelecom.com
+50202
+ Southern Union Conference of Seventh day Adventists
+ Richard Stephenson
+ is&southernunion.com
+50203
+ Sankosha Corporation
+ Yuichi Takahashi
+ takahashi-y&sankosha.co.jp
+50204
+ congliu0913 Limited
+ Liu Cong
+ congliu0913&126.com
+50205
+ Telescent Inc.
+ Anthony Kewitsch
+ kewitsch&telescent.com
+50206
+ QuaeroSys UG
+ Johannes Braun
+ mail&quaerosys.com
+50207
+ Kerridge Commercial Systems
+ Neil Mulligan
+ neil.mulligan&kerridgecs.com
+50208
+ TRANSPORTS GPH
+ PHILIPPE GEYER
+ transports.gph&orange.fr
+50209
+ kbo-Isar-Amper-Klinikum
+ Nicolas Stein
+ postmaster&kbo.de
+50210
+ The Center for Cancer and Blood Disorders
+ Irene Rand
+ irand&txcc.com
+50211
+ Universitätsstadt Tübingen
+ Michael Politz
+ informationstechnik&tuebingen.de
+50212
+ HostId
+ Mikhail Mikhaylov
+ postmaster&hostid.ru
+50213
+ Positive Technologies
+ Mikhail Golovanov
+ migolovanov&ptsecurity.com
+50214
+ Alfred Kärcher GmbH & Co. KG
+ Ronny Buchmann
+ dns.admin&de.kaercher.com
+50215
+ FIBOIS Alsace
+ Cedric Luneau
+ cedric&fibois-alsace.com
+50216
+ Two Degrees Ltd
+ Anton Pereira
+ NOC&2degrees.nz
+50217
+ EVICERTIA (formerly 'Evidencias Certificadas SL')
+ Jacobo van Leeuwen
+ info&evicertia.com
+50218
+ Union Scribe
+ Kevin Burkhart
+ kburkhart&unionscribe.com
+50219
+ Alaska Railroad
+ Brian Scheid
+ scheidb&akrr.com
+50220
+ Lukas Müller
+ Lukas Müller
+ info&muellerlukas.de
End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index 6949641062..c88efe2e12 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -2770,7 +2770,7 @@ const value_string sminmpec_values[] = {
{ 2747, "Dirig Software, Inc." },
{ 2748, "ICL Retail Systems Europe" },
{ 2749, "Aptia, Inc." },
- { 2750, "WaveCom Electronics Inc." },
+ { 2750, "Vecima Networks Inc. (formerly 'WaveCom Electronics Inc.')" },
{ 2751, "Globalcast Communications Inc." },
{ 2752, "McComm International bv" },
{ 2753, "ARGO Data Resource Corporation Thomas" },
@@ -9580,7 +9580,7 @@ const value_string sminmpec_values[] = {
{ 9557, "Synso Inc." },
{ 9558, "Kent Ridge Digital Labs" },
{ 9559, "National Security Research Institute" },
- { 9560, "SECUi.COM Corporation" },
+ { 9560, "SECUI" },
{ 9561, "Netia Telekom S.A." },
{ 9562, "Magnum Imperium Limited" },
{ 9563, "Suffolk College" },
@@ -46163,7 +46163,7 @@ const value_string sminmpec_values[] = {
{ 46140, "Laboratoire d'Analyse et de Math\0303\0251matiques Appliqu\0303\0251es" },
{ 46141, "Ysance" },
{ 46142, "ShenZhen Sinexcel Electric Co.Ltd." },
- { 46143, "Lazada Tech Hub" },
+ { 46143, "Lazada South East Asia (formerly 'Lazada Tech Hub')" },
{ 46144, "Schmidt & Co., (H.K.) Ltd. Taiwan Branch " },
{ 46145, "A. Baggenstos & Co. AG" },
{ 46146, "INFORM GmbH" },
@@ -49231,7 +49231,7 @@ const value_string sminmpec_values[] = {
{ 49208, "Jackie's Wholesale Nurseries Pty Ltd" },
{ 49209, "easynetworks" },
{ 49210, "CR0BAR Limited" },
- { 49211, "HanseCom Gesellschaft f\0303\0274r Informations- und Kommunikationsdienstleistungen mbH" },
+ { 49211, "DATAGROUP Operate IT GmbH (formerly 'HanseCom Gesellschaft f\0303\0274r Informations- und Kommunikationsdienstleistungen mbH')" },
{ 49212, "Oleg Dubovskoy" },
{ 49213, "Nextcloud" },
{ 49214, "Monzo Bank Limited" },
@@ -50208,6 +50208,39 @@ const value_string sminmpec_values[] = {
{ 50185, "WH Gelsenkirchen FB Informatik" },
{ 50186, "Vodafone UK" },
{ 50187, "Pattern Recognition and Inteligent Systems Laboratory" },
+ { 50188, "zkpig123.org" },
+ { 50189, "anrobot" },
+ { 50190, "CS Corporation" },
+ { 50191, "Matra Mandiri Prima" },
+ { 50192, "SOGETEL srl" },
+ { 50193, "ANA-U GmbH" },
+ { 50194, "Deutscher Genossenschafts-Verlag eG" },
+ { 50195, "Domo Tactical Communications (DTC) Ltd" },
+ { 50196, "Instituto de F\0303\0255sica Gleb Wataghin - Unicamp" },
+ { 50197, "jedi solutions" },
+ { 50198, "Aplura, LLC" },
+ { 50199, "Skogsbolaget Mats Broberg AB" },
+ { 50200, "yellowshelf" },
+ { 50201, "Cubic Telecom" },
+ { 50202, "Southern Union Conference of Seventh day Adventists" },
+ { 50203, "Sankosha Corporation" },
+ { 50204, "congliu0913 Limited" },
+ { 50205, "Telescent Inc." },
+ { 50206, "QuaeroSys UG" },
+ { 50207, "Kerridge Commercial Systems" },
+ { 50208, "TRANSPORTS GPH" },
+ { 50209, "kbo-Isar-Amper-Klinikum" },
+ { 50210, "The Center for Cancer and Blood Disorders" },
+ { 50211, "Universit\0303\0244tsstadt T\0303\0274bingen" },
+ { 50212, "HostId" },
+ { 50213, "Positive Technologies" },
+ { 50214, "Alfred K\0303\0244rcher GmbH & Co. KG" },
+ { 50215, "FIBOIS Alsace" },
+ { 50216, "Two Degrees Ltd" },
+ { 50217, "EVICERTIA (formerly 'Evidencias Certificadas SL')" },
+ { 50218, "Union Scribe" },
+ { 50219, "Alaska Railroad" },
+ { 50220, "Lukas M\0303\0274ller" },
{ 0, NULL}
};
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-02 20:39:47 +0000