aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/usb.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-08-02 08:10:45 -0700
committerGerald Combs <gerald@wireshark.org>2015-08-02 15:10:53 +0000
commitb1ce65350d4ab3fd7344af3784513a13790a410f (patch)
treeaeec2aabec8e1ca79ece5919580be85b1c1c1840 /epan/dissectors/usb.c
parent711edcfa84aa670e9aa1b72de7285d392e6c9c79 (diff)
[Automatic update for 2015-08-02]
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I1c6b1044870e93459bcf4743f00be68ff8ce8ff6 Reviewed-on: https://code.wireshark.org/review/9851 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/dissectors/usb.c')
-rw-r--r--epan/dissectors/usb.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 6344899de4..495a479175 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -2842,6 +2842,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x2232, "Silicon Motion" },
{ 0x2233, "RadioShack Corporation" },
{ 0x2237, "Kobo Inc." },
+ { 0x225d, "Morpho" },
{ 0x228d, "8D Technologies inc." },
{ 0x22a6, "Pie Digital, Inc." },
{ 0x22b8, "Motorola PCS" },
@@ -17631,6 +17632,14 @@ static const value_string usb_products_vals[] = {
{ 0x22321037, "WebCam SC-03FFM12339N" },
{ 0x22336323, "USB Electronic Scale" },
{ 0x22374161, "eReader White" },
+ { 0x225d0001, "FINGER VP Multimodal Biometric Sensor" },
+ { 0x225d0008, "CBM-E3 Fingerprint Sensor" },
+ { 0x225d0009, "CBM Fingerprint Sensor [CBM-V3]" },
+ { 0x225d000a, "MSO1300-E3 Fingerprint Sensor" },
+ { 0x225d000b, "MSO1300 Fingerprint Sensor [MSO1300-V3]" },
+ { 0x225d000c, "MSO1350-E3 Fingerprint Sensor & SmartCard Reader" },
+ { 0x225d000d, "MSO1350 Fingerprint Sensor & SmartCard Reader [MSO1350-V3]" },
+ { 0x225d000e, "MorphoAccess SIGMA Biometric Access Control Terminal" },
{ 0x228d0001, "Terminal Bike Key Reader" },
{ 0x22a6ffff, "PieKey \"beta\" 4GB model 4E4F41482E4F5247 (SM3251Q BB)" },
{ 0x22b80001, "Wally 2.2 chipset" },