aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/usb.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2016-11-06 08:12:57 -0800
committerGerald Combs <gerald@wireshark.org>2016-11-06 16:13:43 +0000
commit991cbe81c137d73b919a75a6c751f3e402d5acc9 (patch)
tree9d3194bb275b8454f266673f450d40894721f803 /epan/dissectors/usb.c
parent686282083420f26a4e4584053fadbba568ef534f (diff)
[Automatic update for 2016-11-06]
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ia867e3b78363ba806ab99dd8da321f5f48c279cc Reviewed-on: https://code.wireshark.org/review/18691 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/dissectors/usb.c')
-rw-r--r--epan/dissectors/usb.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index f2579fdf66..9952918a5a 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -2879,6 +2879,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x2676, "Basler AG" },
{ 0x2730, "Citizen" },
{ 0x2735, "DigitalWay" },
+ { 0x273f, "Hughski Limited" },
{ 0x2770, "NHJ, Ltd" },
{ 0x27b8, "ThingM" },
{ 0x2821, "ASUSTek Computer Inc." },
@@ -5597,7 +5598,7 @@ static const value_string usb_products_vals[] = {
{ 0x046dc20c, "WingMan Precision" },
{ 0x046dc20d, "WingMan Attack 2" },
{ 0x046dc20e, "WingMan Formula GP" },
- { 0x046dc211, "iTouch Cordless Receiver" },
+ { 0x046dc211, "iTouch Cordless Reciever" },
{ 0x046dc212, "WingMan Extreme Digital 3D" },
{ 0x046dc213, "J-UH16 (Freedom 2.4 Cordless Joystick)" },
{ 0x046dc214, "ATK3 (Attack III Joystick)" },
@@ -18812,6 +18813,12 @@ static const value_string usb_products_vals[] = {
{ 0x27351042, "MPIO FY670" },
{ 0x27351043, "HCT HMD-180A" },
{ 0x27351044, "HCT HMD-180A" },
+ { 0x273f1000, "ColorHug bootloader" },
+ { 0x273f1001, "ColorHug" },
+ { 0x273f1002, "ColorHug+" },
+ { 0x273f1003, "ColorHug+ Bootloader" },
+ { 0x273f1004, "ColorHug2" },
+ { 0x273f1005, "ColorHug2 bootloader" },
{ 0x27700a01, "ScanJet 4600 series" },
{ 0x2770905c, "Che-Ez Snap SNAP-U/Digigr8/Soundstar TDC-35" },
{ 0x27709060, "A130" },