aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/usb.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2014-01-12 15:03:43 +0000
committerGerald Combs <gerald@wireshark.org>2014-01-12 15:03:43 +0000
commit8989899e92f0948163f3c8bcf97baddde520aa59 (patch)
tree7ae36df8d2a0800257040e87d2334fce334dde95 /epan/dissectors/usb.c
parentbdfabe5979358cc5b982421f760f54640e8e1cf8 (diff)
[Automatic manuf, services and enterprise-numbers update for 2014-01-12]
svn path=/trunk/; revision=54702
Diffstat (limited to 'epan/dissectors/usb.c')
-rw-r--r--epan/dissectors/usb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index c1dbb7a1dd..b52fc72a11 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -1041,7 +1041,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x0900, "Pinnacle Systems, Inc." },
{ 0x0901, "VST Technologies" },
{ 0x0906, "Faraday Technology Corp." },
- { 0x0908, "ShenZhen SANZHAI Technology Co.,Ltd" },
+ { 0x0908, "Siemens AG" },
{ 0x0909, "Audio-Technica Corp." },
{ 0x090a, "Trumpion Microelectronics, Inc." },
{ 0x090b, "Neurosmith" },
@@ -2780,6 +2780,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x2232, "Silicon Motion" },
{ 0x2233, "RadioShack Corporation" },
{ 0x2237, "Kobo Inc." },
+ { 0x228d, "8D Technologies inc." },
{ 0x22a6, "Pie Digital, Inc." },
{ 0x22b8, "Motorola PCS" },
{ 0x22b9, "eTurboTouch Technology, Inc." },
@@ -11850,7 +11851,7 @@ static const value_string usb_products_vals[] = {
{ 0x08ffffff, "Sensor (Emulator)" },
{ 0x09010001, "Hard Drive Adapter (TPP)" },
{ 0x09010002, "SigmaDrive Adapter (TPP)" },
- { 0x09082701, "Spy Pen VGA" },
+ { 0x09082701, "ShenZhen SANZHAI Technology Co.,Ltd Spy Pen VGA" },
{ 0x090a1001, "T33520 Flash Card Controller" },
{ 0x090a1100, "Comotron C3310 MP3 player" },
{ 0x090a1200, "MP3 player" },
@@ -16578,6 +16579,7 @@ static const value_string usb_products_vals[] = {
{ 0x22321037, "WebCam SC-03FFM12339N" },
{ 0x22336323, "USB Electronic Scale" },
{ 0x22374161, "eReader White" },
+ { 0x228d0001, "Terminal Bike Key Reader" },
{ 0x22a6ffff, "PieKey \"beta\" 4GB model 4E4F41482E4F5247 (SM3251Q BB)" },
{ 0x22b80001, "Wally 2.2 chipset" },
{ 0x22b80002, "Wally 2.4 chipset" },