aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnish Bhatt <anish@chelsio.com>2014-10-07 00:53:18 -0700
committerMichael Mann <mmann78@netscape.net>2014-10-08 02:51:54 +0000
commitf31836dbafe2b754b8ab62d2d20ee0342802df85 (patch)
treeff1a08b8af2eb323ac7ef9fbaf4fe2037782351e
parent65321dfb87d46657910fe7b79b9f26460a6ea821 (diff)
[bacnet] update vendors list, fix whitespace issues, all generated via script
Change-Id: Ieb4b169dfcf5e89b7b2a2cb90b6572a3d973d744 Reviewed-on: https://code.wireshark.org/review/4519 Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--epan/dissectors/packet-bacapp.c47
1 files changed, 24 insertions, 23 deletions
diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c
index 917ee4af39..ff1a7f8a42 100644
--- a/epan/dissectors/packet-bacapp.c
+++ b/epan/dissectors/packet-bacapp.c
@@ -4101,12 +4101,12 @@ BACnetVendorIdentifiers [] = {
{ 70, "RLE Technologies" },
{ 71, "Cardkey Systems" },
{ 72, "SECOM Co., Ltd." },
- { 73, "ABB Gebaudetechnik AG Bereich NetServ" },
+ { 73, "ABB Gebaeudetechnik AG Bereich NetServ" },
{ 74, "KNX Association cvba" },
{ 75, "Institute of Electrical Installation Engineers of Japan (IEIEJ)" },
{ 76, "Nohmi Bosai, Ltd." },
{ 77, "Carel S.p.A." },
- { 78, "AirSense Technology, Inc." },
+ { 78, "UTC Fire & Security Espana, S.L." },
{ 79, "Hochiki Corporation" },
{ 80, "Fr. Sauter AG" },
{ 81, "Matsushita Electric Works, Ltd." },
@@ -4137,7 +4137,7 @@ BACnetVendorIdentifiers [] = {
{ 106, "Meidensha Corporation" },
{ 107, "JCI Systems Integration Services" },
{ 108, "Freedom Corporation" },
- { 109, "Neuberger Gebaudeautomation GmbH" },
+ { 109, "Neuberger Gebaeudeautomation GmbH" },
{ 110, "Sitronix" },
{ 111, "Leviton Manufacturing" },
{ 112, "Fujitsu Limited" },
@@ -4184,7 +4184,7 @@ BACnetVendorIdentifiers [] = {
{ 153, "National Environmental Product" },
{ 154, "Unitec Corporation" },
{ 155, "Kanden Engineering Company" },
- { 156, "Messner Gebaudetechnik GmbH" },
+ { 156, "Messner Gebaeudetechnik GmbH" },
{ 157, "Integrated.CH" },
{ 158, "Price Industries" },
{ 159, "SE-Elektronic GmbH" },
@@ -4193,7 +4193,7 @@ BACnetVendorIdentifiers [] = {
{ 162, "ASI Controls" },
{ 163, "SysMik GmbH Dresden" },
{ 164, "HSC Regelungstechnik GmbH" },
- { 165, "Smart Temp Australia Pty. Ltd." },
+ { 165, "Smart Temp Australia Pty. Ltd." },
{ 166, "Cooper Controls" },
{ 167, "Duksan Mecasys Co., Ltd." },
{ 168, "Fuji IT Co., Ltd." },
@@ -4205,6 +4205,7 @@ BACnetVendorIdentifiers [] = {
{ 174, "Building Control Integrators" },
{ 175, "ITG Worldwide (M) Sdn Bhd" },
{ 176, "Lutron Electronics Co., Inc." },
+ { 177, "Cooper-Atkins Corporation" },
{ 178, "LOYTEC Electronics GmbH" },
{ 179, "ProLon" },
{ 180, "Mega Controls Limited" },
@@ -4215,7 +4216,7 @@ BACnetVendorIdentifiers [] = {
{ 185, "Hermos AG" },
{ 186, "CEZIM" },
{ 187, "Softing" },
- { 188, "Lynxspring" },
+ { 188, "Lynxspring, Inc." },
{ 189, "Schneider Toshiba Inverter Europe" },
{ 190, "Danfoss Drives A/S" },
{ 191, "Eaton Corporation" },
@@ -4224,7 +4225,7 @@ BACnetVendorIdentifiers [] = {
{ 194, "Noveo, Inc." },
{ 195, "AMEV" },
{ 196, "Yokogawa Electric Corporation" },
- { 197, "GFR Gesellschaft fur Regelungstechnik" },
+ { 197, "GFR Gesellschaft fuer Regelungstechnik" },
{ 198, "Exact Logic" },
{ 199, "Mass Electronics Pty Ltd dba Innotech Control Systems Australia" },
{ 200, "Kandenko Co., Ltd." },
@@ -4333,7 +4334,7 @@ BACnetVendorIdentifiers [] = {
{ 303, "Real Time Automation, Inc." },
{ 304, "ITEC Hankyu-Hanshin Co." },
{ 305, "Cyrus E&M Engineering Co., Ltd." },
- { 306, "Racine Federated, Inc." },
+ { 306, "Badger Meter" },
{ 307, "Cirrascale Corporation" },
{ 308, "Elesta GmbH Building Automation" },
{ 309, "Securiton" },
@@ -4427,7 +4428,7 @@ BACnetVendorIdentifiers [] = {
{ 397, "EGauge Systems, LLC" },
{ 398, "Quantum Automation (ASIA) PTE, Ltd." },
{ 399, "Toshiba Lighting & Technology Corp." },
- { 400, "SPIN Engenharia de Automaca Ltda." },
+ { 400, "SPIN Engenharia de Automacao Ltda." },
{ 401, "Logistics Systems & Software Services India PVT. Ltd." },
{ 402, "Delta Controls Integration Products" },
{ 403, "Focus Media" },
@@ -4455,7 +4456,7 @@ BACnetVendorIdentifiers [] = {
{ 425, "Triacta Power Technologies, Inc." },
{ 426, "Globestar Systems" },
{ 427, "MLB Advanced Media, LP" },
- { 428, "SWG Stuckmann Wirtschaftliche Gebaudesysteme GmbH" },
+ { 428, "SWG Stuckmann Wirtschaftliche Gebaeudesysteme GmbH" },
{ 429, "SensorSwitch" },
{ 430, "Multitek Power Limited" },
{ 431, "Aquametro AG" },
@@ -4490,7 +4491,7 @@ BACnetVendorIdentifiers [] = {
{ 460, "Log-One Ltd." },
{ 461, "TECO Electric & Machinery Co., Ltd." },
{ 462, "ConnectEx, Inc." },
- { 463, "Turbo DDC Sudwest" },
+ { 463, "Turbo DDC Suedwest" },
{ 464, "Quatrosense Environmental Ltd." },
{ 465, "Fifth Light Technology Ltd." },
{ 466, "Scientific Solutions, Ltd." },
@@ -4667,7 +4668,7 @@ BACnetVendorIdentifiers [] = {
{ 638, "Conditionaire International Pty. Limited" },
{ 639, "Quebec, Inc." },
{ 640, "Homerun Holdings" },
- { 641, "RFM, Inc." },
+ { 641, "Murata Americas" },
{ 642, "Comptek" },
{ 643, "Westco Systems, Inc." },
{ 644, "Advancis Software & Services GmbH" },
@@ -4708,7 +4709,7 @@ BACnetVendorIdentifiers [] = {
{ 680, "ISM EuroCenter S.A." },
{ 681, "TDIS" },
{ 682, "Trade FIDES" },
- { 683, "Knurr GmbH (Emerson Network Power)" },
+ { 683, "Knuerr GmbH (Emerson Network Power)" },
{ 684, "Resource Data Management" },
{ 685, "Abies Technology, Inc." },
{ 686, "Amalva" },
@@ -4720,16 +4721,16 @@ BACnetVendorIdentifiers [] = {
{ 692, "Ruskin Manufacturing" },
{ 693, "Calon Associates Limited" },
{ 694, "Contec Co., Ltd." },
- { 695, "iT GmbH"},
- { 696, "Autani Corporation"},
- { 697, "Christian Fortin"},
- { 698, "HDL"},
- { 699, "IPID Sp. Z.O.O Limited"},
- { 700, "Fuji Electric Co., Ltd"},
- { 701, "View, Inc."},
- { 702, "Samsung S1 Corporation"},
- { 703, "New Lift"},
- { 704, "VRT Systems"},
+ { 695, "iT GmbH" },
+ { 696, "Autani Corporation" },
+ { 697, "Christian Fortin" },
+ { 698, "HDL" },
+ { 699, "IPID Sp. Z.O.O Limited" },
+ { 700, "Fuji Electric Co., Ltd" },
+ { 701, "View, Inc." },
+ { 702, "Samsung S1 Corporation" },
+ { 703, "New Lift" },
+ { 704, "VRT Systems" },
{ 705, "Motion Control Engineering, Inc." },
{ 706, "Weiss Klimatechnik GmbH" },
{ 707, "Elkon" },