Shorten the vendor names and fix up the names of some of the

existing entries.

1 files changed, 57 insertions, 57 deletions

diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs
index f17e6ea5d12..ba1cbc49fa4 100644
--- a/sys/dev/mii/miidevs
+++ b/sys/dev/mii/miidevs
@@ -1,4 +1,4 @@
-$OpenBSD: miidevs,v 1.102 2008/10/24 23:01:50 brad Exp $
+$OpenBSD: miidevs,v 1.103 2008/10/24 23:50:42 brad Exp $
 /* $NetBSD: miidevs,v 1.3 1998/11/05 03:43:43 thorpej Exp $ */
 
 /*-
@@ -34,47 +34,47 @@ $OpenBSD: miidevs,v 1.102 2008/10/24 23:01:50 brad Exp $
 /*
  * List of known MII OUIs
  */
-oui AMD				0x00001a	Advanced Micro Devices
-oui REALTEK			0x000020	Realtek Semiconductor
+oui AMD				0x00001a	AMD
+oui REALTEK			0x000020	Realtek
 oui VITESSE			0x0001c1	Vitesse
-oui CICADA			0x0003f1	Cicada Semiconductor
-oui CENIX			0x000749	CENiX Inc.
-oui BROADCOM2			0x000af7	Broadcom Corporation
-oui ASIX			0x000ec6	ASIX Electronics
-oui BROADCOM			0x001018	Broadcom Corporation
+oui CICADA			0x0003f1	Cicada
+oui CENIX			0x000749	CENiX
+oui BROADCOM2			0x000af7	Broadcom
+oui ASIX			0x000ec6	ASIX
+oui BROADCOM			0x001018	Broadcom
 oui 3COM			0x00105a	3com
-oui ALTIMA			0x0010a9	Altima Communications
-oui ENABLESEMI			0x0010dd	Enable Semiconductor
-oui ATHEROS			0x001374	Atheros Communications
-oui JMICRON			0x001b8c	JMicron Technologies
+oui ALTIMA			0x0010a9	Altima
+oui ENABLESEMI			0x0010dd	Enable Semi.
+oui ATHEROS			0x001374	Atheros
+oui JMICRON			0x001b8c	JMicron
 oui LEVEL1			0x00207b	Level 1
-oui VIA				0x004063	VIA Networking Technologies
-oui MARVELL			0x005043	Marvell Semiconductor
-oui LUCENT			0x00601d	Lucent Technologies
-oui QUALSEMI			0x006051	Quality Semiconductor
-oui DAVICOM			0x00606e	Davicom Semiconductor
+oui VIA				0x004063	VIA Networking
+oui MARVELL			0x005043	Marvell
+oui LUCENT			0x00601d	Lucent
+oui QUALITYSEMI			0x006051	Quality Semi.
+oui DAVICOM			0x00606e	Davicom
 oui SMSC			0x00800f	Standard Microsystems
-oui ICPLUS			0x0090c3	IC Plus Corp.
-oui TOPIC			0x0090c3	Topic Semiconductor
+oui ICPLUS			0x0090c3	IC Plus
+oui TOPICSEMI			0x0090c3	Topic Semi.
 oui AGERE			0x00a0bc	Agere
 oui ICS				0x00a0be	Integrated Circuit Systems
 oui SEEQ			0x00a07d	Seeq
 oui INTEL			0x00aa00	Intel
-oui TSC				0x00c039	TDK Semiconductor
-oui MYSON			0x00c0b4	Myson Technology
+oui TDK				0x00c039	TDK
+oui MYSON			0x00c0b4	Myson
 oui PMCSIERRA			0x00e004	PMC-Sierra
 oui SIS				0x00e006	Silicon Integrated Systems
-oui REALTEK2			0x00e04c	Realtek Semiconductor
+oui REALTEK2			0x00e04c	Realtek
 oui JATO			0x00e083	Jato Technologies
-oui XAQTI			0x00e0ae	XaQti Corp.
-oui PLESSEY			0x046b40	Plessey Semiconductor
-oui NATSEMI			0x080017	National Semiconductor
+oui XAQTI			0x00e0ae	XaQti
+oui PLESSEYSEMI			0x046b40	Plessey Semi.
+oui NATSEMI			0x080017	National Semi.
 oui TI				0x080028	Texas Instruments
 
 /* in the 79c873, AMD uses another OUI (which matches Davicom!) */
-oui xxALTIMA			0x000895	Altima Communications
-oui xxAMD			0x00606e	Advanced Micro Devices
-oui xxCICADA			0x00c08f	Cicada Semiconductor (alt)
+oui xxALTIMA			0x000895	Altima
+oui xxAMD			0x00606e	AMD
+oui xxCICADA			0x00c08f	Cicada (alt)
 oui xxINTEL			0x00f800	Intel (alt)
 
 /* some vendors have the bits swapped within bytes
@@ -82,9 +82,9 @@ oui xxINTEL			0x00f800	Intel (alt)
 oui xxICS			0x00057d	Integrated Circuit Systems
 oui xxSEEQ			0x0005be	Seeq
 oui xxSIS			0x000760	Silicon Integrated Systems
-oui xxBROADCOM			0x000818	Broadcom Corporation
+oui xxBROADCOM			0x000818	Broadcom
 oui xxTI			0x100014	Texas Instruments
-oui xxXAQTI			0x350700	XaQti Corp.
+oui xxXAQTI			0x350700	XaQti
 
 /* Level 1 is completely different - from right to left.
 	(Two bits get lost in the third OUI byte.) */
@@ -92,22 +92,22 @@ oui xxLEVEL1a                   0x0004de        Level 1
 oui xxLEVEL1			0x1e0400	Level 1
 
 /* Don't know what's going on here. */
-oui xxBROADCOM2			0x0050ef	Broadcom Corporation
-oui xxDAVICOM			0x006040	Davicom Semiconductor
+oui xxBROADCOM2			0x0050ef	Broadcom
+oui xxDAVICOM			0x006040	Davicom
 
 /* This is the OUI of the gigE PHY in the RealTek 8169S/8110S chips */
-oui xxREALTEK			0x000732	Realtek Semiconductor
+oui xxREALTEK			0x000732	Realtek
 
 /* Contrived vendor for dcphy */
 oui xxDEC			0x040440	Digital Clone
 
-oui xxMARVELL			0x000ac2	Marvell Semiconductor
+oui xxMARVELL			0x000ac2	Marvell
 
 /*
  * List of known models.  Grouped by oui.
  */
 
-/* Advanced Micro Devices PHYs */
+/* AMD PHYs */
 model xxAMD 79C873		0x0000 Am79C873 10/100 PHY
 model AMD 79C875phy		0x0014 Am79C875 quad PHY
 model AMD 79C873phy		0x0036 Am79C873 internal PHY
@@ -115,16 +115,16 @@ model AMD 79C873phy		0x0036 Am79C873 internal PHY
 /* Agere PHYs */
 model AGERE ET1011		0x0004 ET1011 10/100/1000baseT PHY
 
-/* Atheros Communications PHYs */
+/* Atheros PHYs */
 model ATHEROS F1		0x0001 F1 10/100/1000 PHY
 model ATHEROS F2		0x0002 F2 10/100 PHY
 
-/* Altima Communications PHYs */
+/* Altima PHYs */
 model xxALTIMA AC_UNKNOWN	0x0001 AC_UNKNOWN 10/100 PHY
 model xxALTIMA AC101L		0x0012 AC101L 10/100 PHY
 model xxALTIMA AC101		0x0021 AC101 10/100 PHY
 
-/* Broadcom Corp. PHYs */
+/* Broadcom PHYs */
 model xxBROADCOM BCM5400	0x0004 BCM5400 1000baseT PHY
 model xxBROADCOM BCM5401	0x0005 BCM5401 10/100/1000baseT PHY
 model xxBROADCOM BCM5411	0x0007 BCM5411 10/100/1000baseT PHY
@@ -158,7 +158,7 @@ model BROADCOM BCM5220		0x0033 BCM5220 10/100 PHY
 model BROADCOM BCM4401		0x0036 BCM4401 10/100baseTX PHY
 model BROADCOM2 BCM5906		0x0004 BCM5906 10/100baseTX PHY
 
-/* Cicada Semiconductor PHYs (now owned by Vitesse) */
+/* Cicada PHYs (now owned by Vitesse) */
 model xxCICADA CS8201B		0x0021 Cicada CS8201 10/100/1000TX PHY
 model CICADA CS8201		0x0001 Cicada CS8201 10/100/1000TX PHY
 model CICADA CS8204		0x0004 Cicada CS8204 10/100/1000TX PHY
@@ -166,7 +166,7 @@ model CICADA VSC8211		0x000b VSC8211 10/100/1000 PHY
 model CICADA CS8201A		0x0020 Cicada CS8201 10/100/1000TX PHY
 model CICADA CS8201B		0x0021 Cicada CS8201 10/100/1000TX PHY
 
-/* Davicom Semiconductor PHYs */
+/* Davicom PHYs */
 model xxDAVICOM DM9101		0x0000 DM9101 10/100 PHY
 model DAVICOM DM9102		0x0004 DM9102 10/100 PHY
 model DAVICOM DM9601		0x000c DM9601 10/100 PHY
@@ -174,13 +174,13 @@ model DAVICOM DM9601		0x000c DM9601 10/100 PHY
 /* Contrived vendor/model for dcphy */
 model xxDEC xxDC		0x0001 DC
 
-/* Enable Semiconductor PHYs (Agere) */
+/* Enable Semi. PHYs (Agere) */
 model ENABLESEMI LU3X31FT	0x0001 Enable LU3X31FT
 model ENABLESEMI LU3X31T2	0x0002 Enable LU3X31T2
 model ENABLESEMI 88E1000S	0x0004 Enable 88E1000S
 model ENABLESEMI 88E1000	0x0005 Enable 88E1000
 
-/* IC Plus Corp. PHYs */
+/* IC Plus PHYs */
 model ICPLUS IP100		0x0004 IP100 10/100 PHY
 model ICPLUS IP101		0x0005 IP101 10/100 PHY
 model ICPLUS IP1000A		0x0008 IP1000A 10/100/1000 PHY
@@ -202,7 +202,7 @@ model INTEL I82553		0x0035 i82553 10/100 PHY
 /* Jato Technologies PHYs */
 model JATO BASEX		0x0000 Jato 1000baseX PHY
 
-/* JMicron Technologies PHYs */
+/* JMicron PHYs */
 model JMICRON JMP211		0x0021 JMP211 10/100/1000 PHY
 model JMICRON JMP202		0x0022 JMP202 10/100 PHY
 
@@ -212,12 +212,12 @@ model xxLEVEL1a LXT971		0x000e LXT971 10/100 PHY
 model LEVEL1 LXT1000_OLD	0x0003 LXT1000 10/100/1000 PHY
 model LEVEL1 LXT1000		0x000c LXT1000 10/100/1000 PHY
 
-/* Lucent Technologies PHYs */
+/* Lucent PHYs */
 model LUCENT LU6612		0x000c LU6612 10/100 PHY
 model LUCENT LU3X51FT		0x0033 LU3X51FT 10/100 PHY
 model LUCENT LU3X54FT		0x0036 LU3X54FT 10/100 PHY
 
-/* Marvell Semiconductor PHYs */
+/* Marvell PHYs */
 model xxMARVELL E1000_5		0x0002 Marvell 88E1000 5 Gigabit PHY
 model xxMARVELL E1000_6		0x0003 Marvell 88E1000 6 Gigabit PHY
 model xxMARVELL E1000_7		0x0005 Marvell 88E1000 7 Gigabit PHY
@@ -237,10 +237,10 @@ model MARVELL E1118		0x0022 Marvell 88E1118 Gigabit PHY
 model MARVELL E1116R		0x0024 Marvell 88E1116R Gigabit PHY
 model MARVELL E3016		0x0026 Marvell 88E3016 10/100 PHY
 
-/* Myson Technology PHYs */
+/* Myson PHYs */
 model MYSON MTD972		0x0000 MTD972 10/100 PHY
 
-/* National Semiconductor PHYs */
+/* National Semi. PHYs */
 model NATSEMI DP83840		0x0000 DP83840 10/100 PHY
 model NATSEMI DP83843		0x0001 DP83843 10/100 PHY
 model NATSEMI DP83815		0x0002 DP83815 10/100 PHY
@@ -249,13 +249,13 @@ model NATSEMI DP83891		0x0005 DP83891 10/100/1000 PHY
 model NATSEMI DP83861		0x0006 DP83861 10/100/1000 PHY
 model NATSEMI DP83865		0x0007 DP83865 10/100/1000 PHY
 
-/* Plessey Semiconductor PHYs */
+/* Plessey Semi. PHYs */
 model PLESSEY NWK914		0x0000 NWK914 10/100 PHY
 
-/* Quality Semiconductor PHYs */
-model QUALSEMI QS6612		0x0000 QS6612 10/100 PHY
+/* Quality Semi. PHYs */
+model QUALITYSEMI QS6612	0x0000 QS6612 10/100 PHY
 
-/* Realtek Semiconductor PHYs */
+/* Realtek PHYs */
 model xxREALTEK RTL8169S	0x0011 RTL8169S/8110S PHY
 model REALTEK RTL8201L		0x0020 RTL8201L 10/100 PHY
 
@@ -275,16 +275,16 @@ model xxTI TLAN10T		0x0001 ThunderLAN 10baseT PHY
 model xxTI 100VGPMI		0x0002 ThunderLAN 100VG-AnyLan PHY
 model xxTI TNETE2101		0x0003 TNETE2101 PHY
 
-/* TDK Semiconductor PHYs */
-model TSC 78Q2120		0x0014 78Q2120 10/100 PHY
-model TSC 78Q2121		0x0015 78Q2121 100baseTX PHY
+/* TDK PHYs */
+model TDK 78Q2120		0x0014 78Q2120 10/100 PHY
+model TDK 78Q2121		0x0015 78Q2121 100baseTX PHY
 
-/* VIA Networking Technologies PHYs */
+/* VIA Networking PHYs */
 model VIA VT6103		0x0032 VT6103 10/100 PHY
 model VIA VT6103_2		0x0034 VT6103 10/100 PHY
 
 /* Vitesse PHYs */
 model VITESSE VSC8601		0x0002 VSC8601 10/100/1000 PHY
 
-/* XaQti Corp. PHYs */
-model XAQTI XMACII		0x0000 XaQti Corp. XMAC II Gigabit PHY
+/* XaQti PHYs */
+model XAQTI XMACII		0x0000 XMAC II Gigabit PHY