aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/usb.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2018-07-08 08:15:13 +0000
committerGerald Combs <gerald@wireshark.org>2018-07-08 08:15:18 +0000
commit0e043692ecd438f8fd1b8698e1ac3bc798aa8774 (patch)
treecad4420596c6ffe3f6f493f59f26999405d3229f /epan/dissectors/usb.c
parentc0ca2c5534e8a335fe7d31d79bc93cccfe01655c (diff)
[Automatic update for 2018-07-08]
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ice44cde2e4894d9709c4460baa823777fbe2b5f8 Reviewed-on: https://code.wireshark.org/review/28653 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/dissectors/usb.c')
-rw-r--r--epan/dissectors/usb.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 38c1d0b402..287d7ed5d4 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -2793,6 +2793,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x1d50, "OpenMoko, Inc." },
{ 0x1d57, "Xenta" },
{ 0x1d5b, "Smartronix, Inc." },
+ { 0x1d5c, "Fresco Logic" },
{ 0x1d6b, "Linux Foundation" },
{ 0x1d90, "Citizen" },
{ 0x1d9d, "Sigma Sport" },
@@ -2867,6 +2868,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x2184, "GW Instek" },
{ 0x21a1, "Emotiv Systems Pty. Ltd." },
{ 0x21d6, "Agecodagis SARL" },
+ { 0x2207, "Fuzhou Rockchip Electronics Company" },
{ 0x2222, "MacAlly" },
{ 0x2227, "SAMWOO Enterprise" },
{ 0x2232, "Silicon Motion" },
@@ -2891,6 +2893,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x249c, "M2Tech s.r.l." },
{ 0x24e1, "Paratronic" },
{ 0x2516, "Cooler Master Co., Ltd." },
+ { 0x2548, "Pulse-Eight" },
{ 0x2632, "TwinMOS" },
{ 0x2639, "Xsens" },
{ 0x2650, "Electronics For Imaging, Inc. [hex]" },
@@ -18995,6 +18998,7 @@ static const value_string usb_products_vals[] = {
{ 0x1d57ac01, "Wireless Receiver (Keyboard and Mouse)" },
{ 0x1d57ad02, "SE340D PC Remote Control" },
{ 0x1d57af01, "AUVIO Universal Remote Receiver for PlayStation 3" },
+ { 0x1d5c2000, "FL2000/FL2000DX VGA/DVI/HDMI Adapter" },
{ 0x1d6b0001, "1.1 root hub" },
{ 0x1d6b0002, "2.0 root hub" },
{ 0x1d6b0003, "3.0 root hub" },
@@ -19293,6 +19297,24 @@ static const value_string usb_products_vals[] = {
{ 0x21a10001, "EPOC Consumer Headset Wireless Dongle" },
{ 0x21d60002, "Seismic recorder [Tellus]" },
{ 0x22070001, "Various Viewpia DR/bq Kepler" },
+ { 0x22070010, "GoClever Tab R83" },
+ { 0x22070011, "SmartTab" },
+ { 0x2207281a, "RK2818 in Mask ROM mode" },
+ { 0x2207290a, "RK2918 in Mask ROM mode" },
+ { 0x2207292a, "RK2928 in Mask ROM mode" },
+ { 0x2207292c, "RK3026 in Mask ROM mode" },
+ { 0x2207300a, "RK3066 in Mask ROM mode" },
+ { 0x2207300b, "RK3168 in Mask ROM mode" },
+ { 0x2207301a, "RK3036 in Mask ROM mode" },
+ { 0x2207310a, "RK3066B in Mask ROM mode" },
+ { 0x2207310b, "RK3188 in Mask ROM mode" },
+ { 0x2207310c, "RK3126/RK3128 in Mask ROM mode" },
+ { 0x2207310d, "RK3126 in Mask ROM mode" },
+ { 0x2207320a, "RK3288 in Mask ROM mode" },
+ { 0x2207320b, "RK3228/RK3229 in Mask ROM mode" },
+ { 0x2207320c, "RK3328 in Mask ROM mode" },
+ { 0x2207330a, "RK3368 in Mask ROM mode" },
+ { 0x2207330c, "RK3399 in Mask ROM mode" },
{ 0x22220004, "iWebKey Keyboard" },
{ 0x22222520, "Mini Tablet" },
{ 0x22224050, "AirStick joystick" },
@@ -19501,6 +19523,8 @@ static const value_string usb_products_vals[] = {
{ 0x2516002d, "Alcor mouse" },
{ 0x25160047, "MasterKeys Pro L" },
{ 0x25169494, "Sirus Headset" },
+ { 0x25481001, "CEC Adapter" },
+ { 0x25481002, "CEC Adapter" },
{ 0x26323209, "7-in-1 Card Reader" },
{ 0x26390001, "MTi-10 IMU" },
{ 0x26390002, "MTi-20 VRU" },