Remove more duplicate manuf.tmpl entries.

Make a manual pass through manuf.tmpl and remove entries that have
either duplicate or more complete IEEE entries.

Add an Editorconfig entry for manuf.tmpl.
pespin/rlcmac
Gerald Combs 2 years ago committed by Wireshark GitLab Utility
parent 2a5c96a799
commit ac0cc25210
  1. 5
      .editorconfig
  2. 33
      manuf.tmpl

@ -50,6 +50,11 @@ indent_size = 2
indent_style = space
indent_size = 4
# manuf
[manuf.tmpl]
indent_style = tab
indent_size = 8
# C/C++
[*.{c,cpp,h}]
indent_style = space

@ -45,8 +45,6 @@
00:00:09 Powerpip powerpipes?
00:00:18 WebsterC Webster Computer Corporation # Appletalk/Ethernet Gateway
00:00:1B NovellNo Novell (now Eagle Technology)
00:00:20 DIAB
00:00:21 SC&C
00:00:23 AbbAutom ABB Automation AB, Dept. Q
00:00:4F Logicraf Logicraft 386-Ware P.C. Emulator
00:00:5A SkSchnei SK # (Schneider & Koch in Europe and Syskonnect outside of Europe)
@ -60,7 +58,6 @@
00:00:89 CaymanSy Cayman Systems # Gatorbox
00:00:94 AsanteMa Asante # MAC
00:00:A6 NetworkG Network General (internal assignment, not for products)
00:00:A7 NCD
00:00:AA XeroxXer Xerox # Xerox machines
00:00:AC ConwareN Conware Netzpartner # [had Apollo, claimed incorrect]
00:00:B5 Databili Datability # Terminal Servers
@ -116,12 +113,9 @@
00:40:0D LannetDa LANNET Data Communications
00:40:10 SonicMac Sonic # Mac Ethernet interfaces
00:40:13 NttDataC NTT Data Communication Systems Corp
00:40:15 Ascom
00:40:1C AstPenti AST # Pentium/90 PC (emulating AMD EISA card)
00:40:27 SmcMassa SMC Massachusetts # [Had:Sigma (?), maybe the "S"?]
00:40:28 Netcomm
00:40:2A Canoga-P Canoga-Perkins
00:40:2B Trigem
00:40:2F XlntDesi Xlnt Designs Inc (XDI)
00:40:43 NokiaDat Nokia Data Communications
00:40:4D Telecomm Telecomm Techniques
@ -145,7 +139,7 @@
00:4F:49 Realtek
00:4F:4B PineTech Pine Technology Ltd.
00:50:04 3com3c90 3com # 3C90X
00:55:00 Xerox
00:55:00 Xerox Xerox Corporation
00:60:08 3com 3Com # 3Com PCI form factor 3C905 TX board
00:60:09 CiscoCat Cisco # Catalyst 5000 Ethernet switch
00:60:25 ActiveIm Active Imaging Inc.
@ -160,13 +154,11 @@
00:80:04 AntlowCo Antlow Computers, Ltd.
00:80:09 JupiterO Jupiter Systems (older MX-600 series machines)
00:80:0D Vosswink Vosswinkel FU
00:80:0F SMC
00:80:10 Commodor Commodore
00:80:12 ImsImsFa IMS Corp. # IMS failure analysis tester
00:80:13 ThomasCo Thomas Conrad Corp.
00:80:16 WandelGo Wandel & Goltermann
00:80:19 DaynaCom Dayna Communications # "Etherprint" product
00:80:24 Kalpana
00:80:2D Xylogics Xylogics, Inc. # Annex terminal servers
00:80:35 Technolo Technology Works
00:80:37 Ericsson Ericsson Business Comm.
@ -177,12 +169,9 @@
00:80:5C Agilis Agilis
00:80:63 RichardH Richard Hirschmann Gmbh & Co
00:80:6C CegelecP Cegelec Projects Ltd
00:80:7C Fibercom
00:80:87 Okidata
00:80:8A Summit Summit
00:80:8C Netscout Netscout Systems (formerly Frontier Software Development)
00:80:8D Westcove Westcove Technology BV
00:80:96 HDS
00:80:9F AlcatelB Alcatel Business Systems
00:80:A1 Microtes Microtest
00:80:A3 Lantroni Lantronix # (see also 0800A3)
@ -201,7 +190,6 @@
00:80:E3 Coral Coral
00:80:F4 Telemech Telemechanique Electrique
00:80:F7 ZenithCo Zenith Communications Products
00:90:04 3com
00:90:2B CiscoEth Cisco # Ethernet Switches and Light Streams
00:90:F2 CiscoEth Cisco # Ethernet Switches and Light Streams
00:A0:0C KingmaxT Kingmax Technology Inc. # PCMCIA card
@ -245,8 +233,6 @@
00:C0:F2 Transiti Transition Engineering Inc
00:C0:FC Asdg ASDG Incorporated
00:DD:00 Ungerman Ungermann-Bass # IBM RT
00:DD:01 Ungerman Ungermann-Bass
00:DD:08 Ungerman Ungermann-Bass
00:E0:16 Rapid-Ci rapid-city (now a part of bay networks)
00:E0:18 AsustekI Asustek # Intel 82558-based Integrated Fast Ethernet for WIM
00:E0:29 SmcEther SMC EtherPower II 10/100
@ -264,16 +250,11 @@
02:60:60 3com
02:60:8C 3comIbmP 3Com # IBM PC; Imagen; Valid; Cisco; Macintosh
02:A0:C9 Intel
02:AA:3C Olivetti
02:CF:1F CMC
02:E0:3B Prominet Prominet Corporation # Gigabit Ethernet Switch
04:88:45 BayNetwo Bay Networks # token ring line card
08:00:01 Computer Computer Vision
08:00:03 ACC
08:00:05 Symbolic Symbolics # Symbolics LISP machines
08:00:06 SiemensN Siemens Nixdorf # PC clone
08:00:08 BBN
08:00:0A Nestar Nestar Systems
08:00:0B UnisysAl Unisys also Ascom-Timeplex (former Unisys subsidiary)
08:00:0D IclInter ICL (International Computers, Ltd.)
08:00:0E Ncr/At&T
@ -281,23 +262,12 @@
08:00:14 ExcelanB Excelan # BBN Butterfly, Masscomp, Silicon Graphics
08:00:17 National National Semiconductor Corp. (used to have Network System Corp., wrong NSC)
08:00:22 NbiNothi NBI (Nothing But Initials)
08:00:25 Cdc
08:00:26 NorskDat Norsk Data (Nord)
08:00:27 PcsCompu PCS Computer Systems GmbH
08:00:28 TiExplor TI # Explorer
08:00:2B Dec
08:00:2F PrimeCom Prime Computer # Prime 50-Series LHC300
08:00:32 Tigan
08:00:36 Intergra Intergraph # CAE stations
08:00:38 Bull
08:00:39 Spider Spider Systems
08:00:3B Torus Torus Systems
08:00:44 DsiDavid DSI (DAVID Systems, Inc.)
08:00:56 Stanford Stanford University
08:00:66 AgfaPrin AGFA # printers, phototypesetters etc.
08:00:69 SGI
08:00:6A Attst? ATTst (?)
08:00:70 Mitsubis Mitsubishi
08:00:75 DdeDanis DDE (Danish Data Elektronik A/S)
08:00:77 TslNowRe TSL (now Retix)
08:00:7C Vitalink Vitalink # TransLAN III
@ -308,7 +278,6 @@
08:00:89 Kinetics Kinetics # AppleTalk-Ethernet interface
08:00:8D Xyvision XyVision # XyVision machines
08:00:8E Tandem/S Tandem / Solbourne Computer ?
08:00:8F Chipcom Chipcom Corp.
09:00:6A AT&T
10:00:90 HP
10:00:D4 DEC

Loading…
Cancel
Save