diff options
author | Gerald Combs <gerald@wireshark.org> | 2018-09-10 10:23:16 -0700 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2018-09-10 17:38:03 +0000 |
commit | bc600962e2127c493b85042e02e126de60a3dcb1 (patch) | |
tree | b6651b168e22dce7d72a4a91f1fbad026de13bd2 /manuf.tmpl | |
parent | 391b8a9595a1b5cfee19345d86f60a018162dfce (diff) |
Manuf fixups.
Remove some entries from manuf.tmpl that are either redundant or less
informative that their corresponding IEEE entries. Add a missing '"' to
make-manuf.py.
Change-Id: Ia69f4529c5fa1b39f1662b94d072c65bd2d969ea
Reviewed-on: https://code.wireshark.org/review/29568
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'manuf.tmpl')
-rw-r--r-- | manuf.tmpl | 137 |
1 files changed, 1 insertions, 136 deletions
diff --git a/manuf.tmpl b/manuf.tmpl index dafbdf8dac..a9277dd96d 100644 --- a/manuf.tmpl +++ b/manuf.tmpl @@ -43,104 +43,39 @@ 00:00:00 00:00:00 Officially Xerox, but 0:0:0:0:0:0 is more common 00:00:09 Powerpip powerpipes? -00:00:0C Cisco -00:00:0E Fujitsu -00:00:0F Next -00:00:15 Datapoin Datapoint Corporation 00:00:18 WebsterC Webster Computer Corporation # Appletalk/Ethernet Gateway -00:00:1A AMD 00:00:1B NovellNo Novell (now Eagle Technology) -00:00:1D Cabletro Cabletron 00:00:20 DIAB 00:00:21 SC&C -00:00:22 VisualTe Visual Technology 00:00:23 AbbAutom ABB Automation AB, Dept. Q -00:00:29 Imc -00:00:2A Trw -00:00:37 OxfordMe Oxford Metrics Ltd -00:00:3C Auspex -00:00:3F Syntrex Syntrex Inc -00:00:44 Castelle -00:00:49 Apricot Apricot Ltd. -00:00:4C Nec NEC Corporation 00:00:4F Logicraf Logicraft 386-Ware P.C. Emulator -00:00:51 HobElect Hob Electronic Gmbh & Co. KG -00:00:55 AT&T -00:00:58 RacoreCo Racore Computer Products Inc 00:00:5A SkSchnei SK # (Schneider & Koch in Europe and Syskonnect outside of Europe) -00:00:5B Eltec -00:00:5F Sumitomo -00:00:61 GatewayC Gateway Communications -00:00:64 Yokogawa Yokogawa Digital Computer Corp -00:00:65 NetworkG Network General -00:00:66 Talaris -00:00:68 Rosemoun Rosemount Controls -00:00:6B MIPS -00:00:6D Case -00:00:6E Artisoft Artisoft, Inc. 00:00:6F MadgeNet Madge Networks Ltd. # Token-ring adapters 00:00:75 BellNort Bell Northern Research (BNR) 00:00:77 Interpha Interphase # [Used in other systems, e.g. MIPS, Motorola] -00:00:78 LabtamAu Labtam Australia 00:00:79 Networth Networth Incorporated # [bought by Compaq, used in Netelligent series] -00:00:7B Research Research Machines 00:00:7F Linotype Linotype-Hell AG # Linotronic typesetters 00:00:80 CrayComm Cray Communications (formerly Dowty Network Services) # [Also shows as "Harris (3M) (new)" and/or "Imagen(?)" elsewhere] 00:00:83 TadpoleT Tadpole Technology [had Optical Data Systems which is wrong according to both] -00:00:87 Hitachi 00:00:89 CaymanSy Cayman Systems # Gatorbox -00:00:8A Datahous Datahouse Information Systems -00:00:93 Proteon 00:00:94 AsanteMa Asante # MAC -00:00:95 Sony/Tek Sony/Tektronix -00:00:98 CrossCom Cross Com -00:00:99 MemorexT Memorex Telex Corporations -00:00:9F Amerista Ameristar Technology -00:00:A0 SanyoEle Sanyo Electronics -00:00:A3 NAT -00:00:A4 Acorn 00:00:A6 NetworkG Network General (internal assignment, not for products) 00:00:A7 NCD -00:00:A8 StratusC Stratus Computer, Inc. -00:00:A9 NetSys Network Systems 00:00:AA XeroxXer Xerox # Xerox machines 00:00:AC ConwareN Conware Netzpartner # [had Apollo, claimed incorrect] -00:00:AE Dassault Dassault Automatismes et Telecommunications -00:00:B0 RndRadNe RND (RAD Network Devices) -00:00:B1 AlphaMic Alpha Microsystems Inc. -00:00:B3 Cimlinc -00:00:B4 Edimax 00:00:B5 Databili Datability # Terminal Servers -00:00:B6 Micro-Ma Micro-matic Research 00:00:B7 DoveFast Dove # Fastnet 00:00:BB Tri-Data TRI-DATA Systems Inc. # Netway products, 3274 emulators 00:00:C0 WesternD Western Digital now SMC (Std. Microsystems Corp.) 00:00:C6 HpIntell HP Intelligent Networks Operation (formerly Eon Systems) -00:00:C8 Altos 00:00:C9 EmulexTe Emulex # Terminal Servers, Print Servers -00:00:CC Densan Densan Co., Ltd. -00:00:D0 Develcon Develcon Electronics, Ltd. 00:00:D1 Adaptec Adaptec, Inc. # "Nodem" product -00:00:D2 Sbe SBE Inc -00:00:D3 WangLabs Wang Labs -00:00:D4 Puredata 00:00:D7 Dartmout Dartmouth College (NED Router) 00:00:D8 OldNovel old Novell NE1000's (before about 1987?) (also 3Com) -00:00:E2 AcerCoun Acer Counterpoint -00:00:E3 Integrat Integrated Micro Products Ltd -00:00:E6 AptorPro Aptor Produits De Comm Indust -00:00:E8 AcctonTe Accton Technology Corporation -00:00:E9 Isicad ISICAD, Inc. -00:00:ED April 00:00:EE NetworkD Network Designers Limited [also KNX Ltd, a former division] -00:00:F0 Samsung 00:00:F2 SpiderCo Spider Communications # (Montreal, not Spider Systems) 00:00:F3 GandalfD Gandalf Data Ltd. - Canada -00:00:F4 AlliedTe Allied Telesis, Inc. -00:00:F8 Dec -00:00:FB RechnerZ Rechner zur Kommunikation 00:00:FD HighLeve High Level Hardware (Orion, UK) -00:00:FF CamtecEl Camtec Electronics (UK) Ltd. 00:01:43 Ieee802 IEEE 802 00:01:63 NdcNatio NDC (National Datacomm Corporation) 00:01:C8 ThomasCo Thomas Conrad Corp. @@ -150,14 +85,9 @@ 00:04:AC IbmPcmci IBM # PCMCIA Ethernet adapter. 00:05:02 ApplePci Apple (PCI bus Macs) 00:06:29 IbmRisc6 IBM RISC6000 system -00:06:7C Cisco -00:06:C1 Cisco 00:07:01 Cisco RACAL-DATACOM 00:07:0D Cisco251 Cisco # 2511 Token Ring -00:07:99 TippingPoint TippingPoint Technologies, Inc. -00:10:00 CableLabs 00:10:07 CiscoSys Cisco Systems # Catalyst 1900 -00:10:0B Cisco Cisco Systems 00:10:0D CiscoSys Cisco Systems # Catalyst 2924-XL 00:10:11 CiscoSys Cisco Systems # Cisco 75xx 00:10:1F CiscoSys Cisco Systems # Catalyst 2901 @@ -168,26 +98,17 @@ 00:10:60 Billingt Billington # Novell NE200 Compatible 00:10:79 Cisco550 Cisco # 5500 Router 00:10:7A AmbicomW Ambicom (was Tandy?) -00:10:7B Cisco Cisco Systems 00:10:83 Hp-UxE90 HP-UX E 9000/889 00:10:A4 XircomRe Xircom # RealPort 10/100 PC Card -00:10:A6 Cisco 00:10:D7 ArgosyEn Argosy # EN 220 Fast Ethernet PCMCIA -00:10:F6 Cisco 00:20:00 LexmarkP Lexmark (Print Server) -00:20:05 Simplete simpletech 00:20:08 CableCom Cable & Computer Technology 00:20:0C Adastra Adastra Systems Corp -00:20:11 Canopus Canopus Co Ltd -00:20:17 Orbotech 00:20:25 ControlT Control Technology Inc (Industrial Controls and Network Interfaces) 00:20:29 Teleproc TeleProcessing CSU/DSU (now owned by ADC/Kentrox) 00:20:2B AtmlAdva ATML (Advanced Telecommunications Modules, Ltd.) 00:20:35 IbmInter IBM (International Business Machines) # mainframes, Etherjet printers 00:20:36 BmcSoftw BMC Software -00:20:42 Datametr Datametrics Corp -00:20:48 Fore Fore Systems Inc -00:20:4B Autocomp Autocomputer Co Ltd 00:20:4C MitronCo Mitron Computer Pte Ltd 00:20:56 Neoprodu Neoproducts 00:20:61 Dynatech Dynatech Communications Inc @@ -200,7 +121,6 @@ 00:20:94 Cubix Cubix Corporation 00:20:A6 Proxim Proxim Inc 00:20:A7 Pairgain Pairgain Technologies, Inc. -00:20:AF 3com 3COM Corporation 00:20:B6 AgileNet Agile Networks Inc 00:20:B9 Metricom Metricom, Inc. 00:20:C5 EagleNe2 Eagle NE2000 @@ -213,10 +133,8 @@ 00:20:EE Gtech Gtech Corporation 00:20:F6 NetTekKa Net Tek & Karlnet Inc 00:20:F8 CarreraC Carrera Computers Inc -00:20:FC Matrox 00:40:01 ZeroOneT Zero One Technology Co Ltd (ZyXEL?) 00:40:09 Tachiban Tachibana Tectron Co Ltd -00:40:0B Cresc 00:40:0C GeneralM General Micro Systems, Inc. 00:40:0D LannetDa LANNET Data Communications 00:40:10 SonicMac Sonic # Mac Ethernet interfaces @@ -237,7 +155,6 @@ 00:40:33 AddtronT Addtron Technology Co., Ltd. 00:40:39 OptecDai Optec Daiichi Denko Co Ltd 00:40:3C Forks Forks, Inc. -00:40:41 Fujikura Fujikura Ltd. 00:40:43 NokiaDat Nokia Data Communications 00:40:48 SmdInfor SMD Informatica S.A. 00:40:4C Hypertec Hypertec Pty Ltd. @@ -282,7 +199,6 @@ 00:40:AD SmaRegel SMA Regelsysteme Gmbh 00:40:AE DeltaCon Delta Controls, Inc. 00:40:AF DigitalP Digital Products, Inc. (DPI). -00:40:B4 3comKK 3COM K.K. 00:40:B5 VideoTec Video Technology Computers Ltd 00:40:B6 Computer Computerm Corporation 00:40:B9 MacqElec MACQ Electronique SA @@ -323,28 +239,19 @@ 00:4F:49 Realtek 00:4F:4B PineTech Pine Technology Ltd. 00:50:04 3com3c90 3com # 3C90X -00:50:0F Cisco -00:50:50 Cisco 00:50:69 Pixstrea PixStream Incorporated -00:50:BD Cisco -00:50:E2 Cisco 00:55:00 Xerox -00:60:08 3com3com 3Com # 3Com PCI form factor 3C905 TX board +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. -00:60:2F Cisco 00:60:30 Villaget VillageTronic # used on Amiga 00:60:3E Cisco100 Cisco # 100Mbps interface -00:60:47 Cisco 00:60:4E CycleCom Cycle Computer (Sun MotherBoard Replacements) -00:60:5C Cisco 00:60:67 AcerLan Acer Lan 00:60:70 CiscoRou Cisco # routers (2524 and 4500) 00:60:83 Cisco362 Cisco Systems, Inc. # 3620/3640 routers 00:60:8C 3com1990 3Com (1990 onwards) 00:60:94 AmdPcnet AMD PCNET PCI -00:60:97 3com -00:60:B0 HP 00:80:00 Multitec Multitech Systems Inc 00:80:01 Periphon Periphonics Corporation 00:80:04 AntlowCo Antlow Computers, Ltd. @@ -359,7 +266,6 @@ 00:80:13 ThomasCo Thomas Conrad Corp. 00:80:15 Seiko Seiko Systems Inc 00:80:16 WandelGo Wandel & Goltermann -00:80:17 Pfu 00:80:19 DaynaCom Dayna Communications # "Etherprint" product 00:80:1A BellAtla Bell Atlantic 00:80:1B KodiakTe Kodiak Technology @@ -392,7 +298,6 @@ 00:80:60 NetworkI Network Interface Corporation 00:80:62 Interfac Interface Co. 00:80:63 RichardH Richard Hirschmann Gmbh & Co -00:80:64 Wyse 00:80:67 SquareD Square D Company 00:80:69 Computon Computone Systems 00:80:6A EriEmpac ERI (Empac Research Inc.) @@ -446,30 +351,20 @@ 00:80:DA BruelKja Bruel & Kjaer 00:80:E0 Xtp XTP Systems Inc 00:80:E3 Coral Coral -00:80:F1 Opus 00:80:F3 SunElect Sun Electronics Corp 00:80:F4 Telemech Telemechanique Electrique 00:80:F5 Quantel Quantel Ltd 00:80:F7 ZenithCo Zenith Communications Products -00:80:FB Bvm BVM Limited 00:80:FE AzureTec Azure Technologies Inc 00:90:04 3com -00:90:27 Intel 00:90:2B CiscoEth Cisco # Ethernet Switches and Light Streams -00:90:86 Cisco -00:90:92 Cisco -00:90:AB Cisco -00:90:B1 Cisco 00:90:F2 CiscoEth Cisco # Ethernet Switches and Light Streams 00:A0:0C KingmaxT Kingmax Technology Inc. # PCMCIA card -00:A0:24 3com 00:A0:40 ApplePci Apple (PCI Mac) -00:A0:73 Com21 00:A0:C8 Adtran Adtran, Inc. 00:A0:C9 IntelPro Intel (PRO100B and PRO100+) # [used on Cisco PIX firewall among others] 00:A0:CC Lite-OnU Lite-On # (used by MacSense in Adapter for Mac, also seen in PCs) 00:A0:D2 AlliedTe Allied Telesyn -00:AA:00 Intel 00:B0:D0 Computer Computer Products International 00:C0:00 Lanoptic Lanoptics Ltd 00:C0:01 DiatekPa Diatek Patient Managment @@ -488,7 +383,6 @@ 00:C0:0F QnxSoftw QNX Software Systems Ltd. # [also Quantum Software Systems Ltd] 00:C0:11 Interact Interactive Computing Devices 00:C0:12 Netspan Netspan Corp -00:C0:13 Netrix 00:C0:14 Telemati Telematics Calabasas 00:C0:15 NewMedia New Media Corp 00:C0:16 Electron Electronic Theatre Controls @@ -508,7 +402,6 @@ 00:C0:2A OhkuraEl Ohkura Electric Co 00:C0:2B GerloffG Gerloff Gesellschaft Fur 00:C0:2C CentrumC Centrum Communications, Inc. -00:C0:2D FujiPhot Fuji Photo Film Co., Ltd. 00:C0:2E Netwiz 00:C0:2F Okuma Okuma Corp 00:C0:30 Integrat Integrated Engineering B. V. @@ -522,7 +415,6 @@ 00:C0:3D Wieseman Wiesemann & Theis Gmbh 00:C0:3E FaGebrHe Fa. Gebr. Heller Gmbh 00:C0:3F StoresAu Stores Automated Systems Inc -00:C0:40 Ecci 00:C0:41 DigitalT Digital Transmission Systems 00:C0:42 Datalux Datalux Corp. 00:C0:43 Strataco Stratacom @@ -533,11 +425,9 @@ 00:C0:49 UsRoboti US Robotics Total Control (tm) NETServer Card 00:C0:4D Mitec Mitec Ltd 00:C0:4E Comtrol Comtrol Corporation -00:C0:4F Dell 00:C0:50 ToyoDenk Toyo Denki Seizo K.K. 00:C0:51 Advanced Advanced Integration Research 00:C0:55 ModularC Modular Computing Technologies -00:C0:56 Somelec 00:C0:57 MycoElec Myco Electronics 00:C0:58 Dataexpe Dataexpert Corp 00:C0:5B Networks Networks Northwest Inc @@ -664,20 +554,14 @@ 00:C0:FA CanaryCo Canary Communications Inc 00:C0:FB Advanced Advanced Technology Labs 00:C0:FC Asdg ASDG Incorporated -00:C0:FD Prosum 00:DD:00 Ungerman Ungermann-Bass # IBM RT 00:DD:01 Ungerman Ungermann-Bass 00:DD:08 Ungerman Ungermann-Bass -00:E0:11 Uniden Uniden Corporation -00:E0:14 Cisco 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:1E Cisco 00:E0:29 SmcEther SMC EtherPower II 10/100 00:E0:2C Ast-Buil AST - built into 5166M PC motherboard (win95 id's as Intel) -00:E0:34 Cisco 00:E0:39 Paradyne Paradyne 7112 T1 DSU/CSU -00:E0:4F Cisco 00:E0:7D EncoreNe Encore (Netronix?) # 10/100 PCI Fast ethernet card 00:E0:81 TyanComp Tyan Computer Corp. # Onboard Intel 82558 10/100 00:E0:83 JatoTech Jato Technologies, Inc. @@ -686,9 +570,6 @@ 00:E0:B0 CiscoSys Cisco Systems # Various systems reported 00:E0:B8 AmdPcnet AMD PCNet # in a Gateway 2000 00:E0:C5 BcomElec BCOM Electronics Inc. -00:E0:F7 Cisco -00:E0:F9 Cisco -00:E0:FE Cisco 01:0E:CF PN-MC PROFINET Multicast 02:04:06 BbnInter BBN # internal usage (not registered) 02:20:48 Marconi # At least some 2810 send with locally assigned flag set @@ -703,9 +584,7 @@ 08:00:03 ACC 08:00:05 Symbolic Symbolics # Symbolics LISP machines 08:00:06 SiemensN Siemens Nixdorf # PC clone -08:00:07 Apple 08:00:08 BBN -08:00:09 HP 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.) @@ -714,40 +593,28 @@ 08:00:11 Tektroni Tektronix, Inc. 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:1E Apollo -08:00:1F Sharp 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:2E Metaphor 08:00:2F PrimeCom Prime Computer # Prime 50-Series LHC300 -08:00:30 CERN CERN 08:00:32 Tigan 08:00:36 Intergra Intergraph # CAE stations -08:00:37 FujiXero Fuji Xerox 08:00:38 Bull 08:00:39 Spider Spider Systems 08:00:3B Torus Torus Systems -08:00:3D Cadnetix 08:00:44 DsiDavid DSI (DAVID Systems, Inc.) -08:00:46 Sony -08:00:47 Sequent 08:00:48 Eurother Eurotherm Gauging Systems -08:00:49 Univatio Univation 08:00:51 Experdat Experdata 08:00:56 Stanford Stanford University 08:00:57 EvansSut Evans & Sutherland (?) 08:00:66 AgfaPrin AGFA # printers, phototypesetters etc. 08:00:67 Comdesig Comdesign -08:00:68 Ridge 08:00:69 SGI 08:00:6A Attst? ATTst (?) -08:00:6E Excelan 08:00:70 Mitsubis Mitsubishi -08:00:74 Casio 08:00:75 DdeDanis DDE (Danish Data Elektronik A/S) 08:00:77 TslNowRe TSL (now Retix) 08:00:7C Vitalink Vitalink # TransLAN III @@ -756,12 +623,10 @@ 08:00:86 Imagen/Q Imagen/QMS [Now Konica Minolta] 08:00:87 XyplexTe Xyplex # terminal servers 08:00:89 Kinetics Kinetics # AppleTalk-Ethernet interface -08:00:8B Pyramid 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:5A Ibm 10:00:90 HP 10:00:D4 DEC 10:00:E0 AppleA/U Apple A/UX # (modified addresses for licensing) |