Sort out the various Intel Pro/1000 device IDs.

From Marco Peereboom

1 files changed, 33 insertions, 33 deletions

diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index d37f10d9ac1..697f0a3a191 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.724 2004/04/17 17:52:03 deraadt Exp $
+$OpenBSD: pcidevs,v 1.725 2004/05/04 05:59:35 henric Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
 /*
@@ -1128,31 +1128,31 @@ product INTEL GDT_RAID2		0x061f	GDT RAID
 product INTEL 80960RP		0x0960	i960 RP PCI-PCI
 product INTEL 80960RM		0x0962	i960 RM PCI-PCI
 product INTEL 80960RN		0x0964	i960 RN PCI-PCI
-product INTEL 82542		0x1000	PRO/1000 (PWLA8490)
-product INTEL 82543GC_SC	0x1001	PRO/1000F (PWLA8490SX)
-product INTEL 82543GC		0x1004	PRO/1000T (PWLA8490T)
-product INTEL 82544EI		0x1008	PRO/1000XT (PWLA8490XT)
-product INTEL 82544EI_SC	0x1009	PRO/1000XF (PWLA8490XF)
-product INTEL 82544GC		0x100c	PRO/1000T (PWLA8390T)
-product INTEL 82544GC_LOM	0x100d	PRO/1000T LOM
-product INTEL 82540EM		0x100e	PRO/1000MT (PWLA8390MT)
-product INTEL 82545EM		0x100f	PRO/1000MT (PWLA8490MT)
-product INTEL 82546EB		0x1010	PRO/1000MT (PWLA8492MT)
-product INTEL 82545EM_SC	0x1011	PRO/1000MF (PWLA8490MF)
-product INTEL 82546EB_SC	0x1012	PRO/1000MF (PWLA8492MF)
-product INTEL 82541EI		0x1013	PRO/1000 (82541EI)
-product INTEL 82541ER2		0x1014	PRO/1000 (82541ER)
-product INTEL 82540EM_LOM	0x1015	PRO/1000MT (LOM)
-product INTEL 82540EP_LOM	0x1016	PRO/1000 (82540EP LOM)
-product INTEL 82540EP		0x1017	PRO/1000 (82540EP)
-product INTEL 82541EP		0x1018	PRO/1000 (82541EP)
-product INTEL 82547EI		0x1019	PRO/1000 (82547EI)
-product INTEL 82547EI_LOM	0x101a	PRO/1000 (82547EI LOM)
-product INTEL 82546EB_QUAD	0x101d	PRO/1000 (82546EB_QUAD)
-product INTEL 82540EP_LP	0x101e	PRO/1000 (82540EP LP)
-product INTEL 82545GM_COPPER	0x1026	PRO/1000 (82545GM)
-product INTEL 82545GM_FIBER	0x1027	PRO/1000 (82545GM)
-product INTEL 82545GM_SERDES	0x1028	PRO/1000 (82545GM)
+product INTEL 82542		0x1000	PRO/1000 (82542)
+product INTEL 82543GC_SC	0x1001	PRO/1000F (82543GC)
+product INTEL 82543GC		0x1004	PRO/1000T (82543GC)
+product INTEL 82544EI		0x1008	PRO/1000XT (82544EI)
+product INTEL 82544EI_SC	0x1009	PRO/1000XF (82544EI)
+product INTEL 82544GC		0x100c	PRO/1000T (82544GC)
+product INTEL 82544GC_LOM	0x100d	PRO/1000XT (82544GC)
+product INTEL 82540EM		0x100e	PRO/1000MT (82540EM)
+product INTEL 82545EM		0x100f	PRO/1000MT (82545EM)
+product INTEL 82546EB		0x1010	PRO/1000MT Dual Port (82546EB)
+product INTEL 82545EM_SC	0x1011	PRO/1000MF (82545EM)
+product INTEL 82546EB_SC	0x1012	PRO/1000MF Dual Port (82546EB)
+product INTEL 82541EI		0x1013	PRO/1000MT (82541EI)
+product INTEL 82541EI_NC	0x1014	PRO/1000MT (82541EI)
+product INTEL 82540EM_LOM	0x1015	PRO/1000MT Mobile (82540EM)
+product INTEL 82540EP_LOM	0x1016	PRO/1000MT (82540EP)
+product INTEL 82540EP		0x1017	PRO/1000MT (82540EP)
+product INTEL 82541EP		0x1018	PRO/1000MT Mobile (82541EP)
+product INTEL 82547EI		0x1019	PRO/1000CT (82547EI)
+product INTEL 82547EI_MOB	0x101a	PRO/1000CT Mobile (82547EI)
+product INTEL 82546EB_QUAD	0x101d	PRO/1000MF Quad Port (82546EB)
+product INTEL 82540EP_LP	0x101e	PRO/1000MT Mobile (82540EP)
+product INTEL 82545GM_COPPER	0x1026	PRO/1000MT (82545GM)
+product INTEL 82545GM_FIBER	0x1027	PRO/1000MF (82545GM)
+product INTEL 82545GM_SERDES	0x1028	PRO/1000MB (82545GM)
 product INTEL PRO_100		0x1029	PRO/100 
 product INTEL 82559		0x1030	82559
 product INTEL PRO_100_VE_0	0x1031	PRO/100 VE
@@ -1174,13 +1174,13 @@ product INTEL PROXGB		0x1048	PRO/XGB
 product INTEL PRO_100_VE_5	0x1050	PRO/100 VE
 product INTEL PRO_100_VE_6	0x1051	PRO/100 VE
 product INTEL PRO_100_M		0x1059	PRO/100 M
-product INTEL 82547GI		0x1075	PRO/1000MT (82547GI)
-product INTEL 82541GI		0x1076	PRO/1000MT (82541GI)
-product INTEL 82541GI_MOBILE	0x1077	PRO/1000MT (82541GI)
-product INTEL 82541ER		0x1078	PRO/1000MT (82541ER)
-product INTEL 82546GB_COPPER	0x1079	PRO/1000MT (82546GB)
-product INTEL 82546GB_FIBER	0x107A	PRO/1000MT (82546GB)
-product INTEL 82546GB_SERDES	0x107B	PRO/1000MT (82546GB)
+product INTEL 82547EI_CT	0x1075	PRO/1000CT (82547EI)
+product INTEL 82541EI_MT	0x1076	PRO/1000MT (82541EI)
+product INTEL 82541EI_MOB	0x1077	PRO/1000MT Mobile (82541EI)
+product INTEL 82541EI_MT2	0x1078	PRO/1000MT (82541EI)
+product INTEL 82546EB_COPPER	0x1079	PRO/1000MT Dual Port (82546EB)
+product INTEL 82546EB_FIBER	0x107A	PRO/1000MF Dual Port (82546EB)
+product INTEL 82546EB_SERDES	0x107B	PRO/1000MB Dual Port (82546EB)
 product INTEL 82815_DC100_HUB	0x1100	82815 Hub
 product INTEL 82815_DC100_AGP	0x1101	82815 AGP
 product INTEL 82815_DC100_GRAPH	0x1102	82815 Graphics