[Automatic manuf, services and enterprise-numbers update for 2015-03-29]

Change-Id: Ied01fe7ddb1734f1f8974c725b802075220bbd0f
Reviewed-on: https://code.wireshark.org/review/7843
Reviewed-by: Gerald Combs <gerald@wireshark.org>

1 files changed, 32 insertions, 0 deletions

diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 4a33cb7ec4..cdd70f9075 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -2559,6 +2559,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x198f, "Beceem Communications Inc." },
     { 0x1990, "Acron Precision Industrial Co., Ltd." },
     { 0x1995, "Trillium Technology Pty. Ltd." },
+    { 0x1996, "PixeLINK" },
     { 0x199b, "MicroStrain, Inc." },
     { 0x199e, "The Imaging Source Europe GmbH" },
     { 0x199f, "Benica Corporation" },
@@ -2851,6 +2852,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x27b8, "ThingM" },
     { 0x2821, "ASUSTek Computer Inc." },
     { 0x2899, "Toptronic Industrial Co., Ltd" },
+    { 0x289b, "Dracal/Raphnet technologies" },
     { 0x2931, "Jolla Oy" },
     { 0x2a03, "dog hunter AG" },
     { 0x2c02, "Planex Communications" },
@@ -16551,10 +16553,22 @@ static const value_string usb_products_vals[] = {
     { 0x1781083e, "MetaGeek Wi-Spy" },
     { 0x1781083f, "MetaGeek Wi-Spy 2.4x" },
     { 0x17810938, "Iguanaworks USB IR Transceiver" },
+    { 0x17810a96, "raphnet.net usb_game12" },
+    { 0x17810a97, "raphnet.net SNES mouse adapter" },
+    { 0x17810a98, "raphnet.net USBTenki" },
+    { 0x17810a99, "raphnet.net NES" },
+    { 0x17810a9a, "raphnet.net Gamecube/N64 controller" },
+    { 0x17810a9b, "raphnet.net DB9Joy" },
+    { 0x17810a9c, "raphnet.net Intellivision" },
+    { 0x17810a9d, "raphnet.net 4nes4snes" },
+    { 0x17810a9e, "raphnet.net Megadrive multitap" },
+    { 0x17810a9f, "raphnet.net MultiDB9joy" },
     { 0x17810c30, "Telldus TellStick" },
     { 0x17810c31, "Telldus TellStick Duo" },
     { 0x17810c9f, "USBtiny" },
     { 0x17811eef, "OpenAPC SecuKey" },
+    { 0x17811ef0, "E1701 Modular Controller Card" },
+    { 0x17811ef1, "E1701 Modular Controller Card" },
     { 0x17840001, "eHome Infrared Transceiver" },
     { 0x17840004, "RF Combo Device" },
     { 0x17840006, "eHome Infrared Transceiver" },
@@ -16817,6 +16831,9 @@ static const value_string usb_products_vals[] = {
     { 0x198f0220, "BCSM250 WiMAX Adapter" },
     { 0x19953202, "REC-ADPT-USB (recorder)" },
     { 0x19953203, "REC-A-ADPT-USB (recorder)" },
+    { 0x19963010, "Camera Release 4" },
+    { 0x19963011, "OEM Camera" },
+    { 0x19963012, "e-ImageData Corp. ScanPro" },
     { 0x199b3065, "3DM-GX3-25 Orientation Sensor" },
     { 0x199e8101, "DFx 21BU04 Camera" },
     { 0x19ab1000, "ProScope HR" },
@@ -17681,6 +17698,21 @@ static const value_string usb_products_vals[] = {
     { 0x2821160f, "WL-160g 802.11g Wireless Adapter [Envara WiND512]" },
     { 0x28213300, "WL-140 / Hawking HWU36D 802.11b Wireless Adapter [Intersil PRISM 3]" },
     { 0x2899012c, "Camera Device" },
+    { 0x289b0001, "Gamecube/N64 controller v2.2" },
+    { 0x289b0002, "2nes2snes" },
+    { 0x289b0003, "4nes4snes" },
+    { 0x289b0004, "Gamecube/N64 controller v2.3" },
+    { 0x289b0005, "Saturn (Joystick mode)" },
+    { 0x289b0006, "Saturn (Mouse mode)" },
+    { 0x289b0007, "Famicom controller" },
+    { 0x289b0008, "Dreamcast (Joystick mode)" },
+    { 0x289b0009, "Dreamcast (Mouse mode)" },
+    { 0x289b000a, "Dreamcast (Keyboard mode)" },
+    { 0x289b000b, "Gamecube/N64 controller v2.9 (Keyboard mode)" },
+    { 0x289b000c, "Gamecube/N64 controller v2.9 (Joystick mode)" },
+    { 0x289b0100, "Dual-relay board" },
+    { 0x289b0500, "Energy meter" },
+    { 0x289b0502, "Precision barometer" },
     { 0x29310a01, "Jolla Phone MTP" },
     { 0x29310a02, "Jolla Phone Developer" },
     { 0x29310a05, "Jolla PC connection" },