- better pcidevs entries for Intel Gig and add 82573 ids

- add/fix up Abocom enries

4 files changed, 68 insertions, 61 deletions

diff --git a/sys/dev/cardbus/if_dc_cardbus.c b/sys/dev/cardbus/if_dc_cardbus.c
index d5dd0fc770f..9dfd3b680db 100644
--- a/sys/dev/cardbus/if_dc_cardbus.c
+++ b/sys/dev/cardbus/if_dc_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_dc_cardbus.c,v 1.19 2005/05/16 01:36:25 brad Exp $	*/
+/*	$OpenBSD: if_dc_cardbus.c,v 1.20 2005/05/29 07:54:33 brad Exp $	*/
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -67,6 +67,7 @@ const struct cardbus_matchid dc_cardbus_devices[] = {
 	{ PCI_VENDOR_ADMTEK, PCI_PRODUCT_ADMTEK_AN985 },
 	{ PCI_VENDOR_ACCTON, PCI_PRODUCT_ACCTON_EN2242 },
 	{ PCI_VENDOR_ABOCOM, PCI_PRODUCT_ABOCOM_FE2500 },
+	{ PCI_VENDOR_ABOCOM, PCI_PRODUCT_ABOCOM_FE2500MX },
 	{ PCI_VENDOR_ABOCOM, PCI_PRODUCT_ABOCOM_PCM200 },
 	{ PCI_VENDOR_LINKSYS, PCI_PRODUCT_LINKSYS_PCM200 },
 	{ PCI_VENDOR_HAWKING, PCI_PRODUCT_HAWKING_PN672TX },
@@ -161,6 +162,7 @@ dc_cardbus_attach(parent, self, aux)
 		if (PCI_PRODUCT(ca->ca_id) == PCI_PRODUCT_ADMTEK_AN985 ||
 		    PCI_PRODUCT(ca->ca_id) == PCI_PRODUCT_ACCTON_EN2242 ||
 		    PCI_PRODUCT(ca->ca_id) == PCI_PRODUCT_ABOCOM_FE2500 ||
+		    PCI_PRODUCT(ca->ca_id) == PCI_PRODUCT_ABOCOM_FE2500MX ||
 		    PCI_PRODUCT(ca->ca_id) == PCI_PRODUCT_ABOCOM_PCM200 ||
 		    PCI_PRODUCT(ca->ca_id) == PCI_PRODUCT_LINKSYS_PCM200 ||
 		    PCI_PRODUCT(ca->ca_id) == PCI_PRODUCT_HAWKING_PN672TX ||
diff --git a/sys/dev/cardbus/if_rl_cardbus.c b/sys/dev/cardbus/if_rl_cardbus.c
index 50aee1339cb..6bd412a0ad7 100644
--- a/sys/dev/cardbus/if_rl_cardbus.c
+++ b/sys/dev/cardbus/if_rl_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rl_cardbus.c,v 1.9 2005/05/16 01:36:25 brad Exp $ */
+/*	$OpenBSD: if_rl_cardbus.c,v 1.10 2005/05/29 07:54:33 brad Exp $ */
 /*	$NetBSD: if_rl_cardbus.c,v 1.3.8.3 2001/11/14 19:14:02 nathanw Exp $	*/
 
 /*
@@ -94,8 +94,8 @@
  * Various supported device vendors/types and their names.
  */
 const struct cardbus_matchid rl_cardbus_devices[] = {
-	{ PCI_VENDOR_ACCTON, PCI_PRODUCT_ACCTON_5030	},
-	{ PCI_VENDOR_ABOCOM, PCI_PRODUCT_ABOCOM_TE100	},
+	{ PCI_VENDOR_ACCTON, PCI_PRODUCT_ACCTON_5030 },
+	{ PCI_VENDOR_ABOCOM, PCI_PRODUCT_ABOCOM_FE2000VX },
 	{ PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8138 },
 	{ PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8139 },
 	{ PCI_VENDOR_COREGA, PCI_PRODUCT_COREGA_CB_TXD },
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c
index 4a1c2df75ed..b987afd3449 100644
--- a/sys/dev/pci/if_em.c
+++ b/sys/dev/pci/if_em.c
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 ***************************************************************************/
 
 /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */
-/* $OpenBSD: if_em.c,v 1.52 2005/05/27 20:36:35 brad Exp $ */
+/* $OpenBSD: if_em.c,v 1.53 2005/05/29 07:54:26 brad Exp $ */
 
 #include "bpfilter.h"
 #include "vlan.h"
@@ -99,40 +99,41 @@ char em_driver_version[] = "1.7.35";
  *  PCI Device ID Table
  *********************************************************************/
 const struct pci_matchid em_devices[] = {
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82542 },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC_SC },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI_SC },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544GC },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544GC_LOM },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EM },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545EM },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545EM_SC },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_SC },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_NC },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EM_LOM },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP_LOM },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EP },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI_MOB },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_QUAD },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP_LOM },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP_LP },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541ER },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541ER_LOM },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_MOBILE },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541GI },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541GI_LF },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541GI_MOBILE },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82542 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC_FIBER },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC_COPPER },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI_COPPER },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI_FIBER },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544GC_COPPER },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544GC_LOM },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545EM_COPPER },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545EM_FIBER },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545GM_COPPER },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545GM_FIBER },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545GM_SERDES },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI_CT },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_MT },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_MOB },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_MT2 },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_COPPER },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_FIBER },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_SERDES },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB },
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_1000_GT }
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_QUAD_COPPER },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_COPPER },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_FIBER },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_SERDES },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_PCIE },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_QUAD_COPPER },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI_MOBILE },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547GI },
 };
 
 /*********************************************************************
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index d4ef3a36e15..fa88c39a49c 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.869 2005/05/26 05:01:07 fgsch Exp $
+$OpenBSD: pcidevs,v 1.870 2005/05/29 07:54:26 brad Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
 /*
@@ -377,9 +377,10 @@ product TRIWARE ESCALADE	0x1000	Escalade IDE RAID
 product TRIWARE ESCALADE_ASIC	0x1001	Escalade IDE RAID
 
 /* Abocom products */
-product ABOCOM FE2500		0xab02	FE2500
-product ABOCOM PCM200		0xab03	PCM200
-product ABOCOM TE100		0xab06	TE100
+product ABOCOM FE2500		0xab02	FE2500 10/100
+product ABOCOM PCM200		0xab03	PCM200 10/100
+product ABOCOM FE2000VX		0xab06	FE2000VX 10/100
+product ABOCOM FE2500MX		0xab08	FE2500MX 10/100
 
 /* Aironet Products */
 product AIRONET PC4800_1	0x0001	PC4800 Wireless
@@ -604,7 +605,7 @@ product AD 1889			0x1889	AD1889 Audio
 product AD SP2141		0x2f44	SafeNet ADSP 2141
 
 /* Antares Microsystems products */
-product ANTARES TC9021		0x1021	Antares Gigabit
+product ANTARES TC9021		0x1021	Antares
 
 /* Apple products */
 product APPLE BANDIT		0x0001	Bandit
@@ -629,7 +630,7 @@ product APPLE UNINORTH2		0x002e	Uni-N2 Host
 product APPLE UNINORTH2ETH	0x002f	Uni-N2 Host
 product APPLE PANGEA_FW		0x0030	Pangea FireWire
 product APPLE UNINORTH_FW	0x0031	UniNorth Firewire
-product APPLE GMAC3		0x0032	GMAC Ethernet
+product APPLE GMAC3		0x0032	GMAC
 product APPLE UNINORTH_ATA	0x0033	Uni-N ATA
 product APPLE UNINORTH_AGP3	0x0034	UniNorth AGP
 product APPLE UNINORTH5		0x0035	UniNorth PCI
@@ -1015,7 +1016,7 @@ product COMPAQ NF3P		0xf130	NetFlex 3/P
 product COMPAQ NF3P_BNC		0xf150	NetFlex 3/PB
 
 /* Compex */
-product COMPEX COMPEXE		0x1401	Ethernet
+product COMPEX COMPEXE		0x1401	Compexe
 product COMPEX RL100ATX		0x2011	RL100-ATX 10/100
 product COMPEX 98713		0x9881	PMAC 98713
 
@@ -1328,28 +1329,28 @@ 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 (82542)
-product INTEL 82543GC_SC	0x1001	PRO/1000F (82543GC)
+product INTEL 82543GC_FIBER	0x1001	PRO/1000F (82543GC)
 product INTEL MODEM56		0x1002	56k Modem
-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 82543GC_COPPER	0x1004	PRO/1000T (82543GC)
+product INTEL 82544EI_COPPER	0x1008	PRO/1000XT (82544EI)
+product INTEL 82544EI_FIBER	0x1009	PRO/1000XF (82544EI)
+product INTEL 82544GC_COPPER	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 DP (82546EB)
-product INTEL 82545EM_SC	0x1011	PRO/1000MF (82545EM)
-product INTEL 82546EB_SC	0x1012	PRO/1000MF DP (82546EB)
+product INTEL 82545EM_COPPER	0x100f	PRO/1000MT (82545EM)
+product INTEL 82546EB_COPPER	0x1010	PRO/1000MT (82546EB)
+product INTEL 82545EM_FIBER	0x1011	PRO/1000MF (82545EM)
+product INTEL 82546EB_FIBER	0x1012	PRO/1000MF (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 82541ER_LOM	0x1014	PRO/1000MT (82541EI)
+product INTEL 82540EM_LOM	0x1015	PRO/1000MT (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 82541EI_MOBILE	0x1018	PRO/1000MT Mobile (82541EI)
 product INTEL 82547EI		0x1019	PRO/1000CT (82547EI)
-product INTEL 82547EI_MOB	0x101a	PRO/1000CT Mobile (82547EI)
-product INTEL 82546GB_QUAD	0x101d	PRO/1000MT QP (82546GB)
-product INTEL 82540EP_LP	0x101e	PRO/1000MT Mobile (82540EP)
+product INTEL 82547EI_MOBILE	0x101a	PRO/1000CT Mobile (82547EI)
+product INTEL 82546EB_QUAD_COPPER 0x101d	PRO/1000MT QP (82546EB)
+product INTEL 82540EP_LP	0x101e	PRO/1000MT (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)
@@ -1377,15 +1378,18 @@ product INTEL PRO_100_VE_6	0x1051	PRO/100 VE
 product INTEL PRO_100_M		0x1059	PRO/100 M
 product INTEL PRO_100_VE_7	0x1064	PRO/100 VE (82562EZ)
 product INTEL PRO_100_VE_8	0x1068	PRO/100 VE (82801FBM)
-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 DP (82546EB)
-product INTEL 82546EB_FIBER	0x107A	PRO/1000MF DP (82546EB)
-product INTEL 82546EB_SERDES	0x107B	PRO/1000MB DP (82546EB)
-product INTEL PRO_1000_GT	0x107C	PRO/1000GT
-product INTEL 82546GB		0x108A	PRO/1000MT DP (82546GB)
+product INTEL 82547GI		0x1075	PRO/1000CT (82547GI)
+product INTEL 82541GI		0x1076	PRO/1000MT (82541GI)
+product INTEL 82541GI_MOBILE	0x1077	PRO/1000MT Mobile (82541GI)
+product INTEL 82541ER		0x1078	PRO/1000MT (82541ER)
+product INTEL 82546GB_COPPER	0x1079	PRO/1000MT (82546GB)
+product INTEL 82546GB_FIBER	0x107A	PRO/1000MF (82546GB)
+product INTEL 82546GB_SERDES	0x107B	PRO/1000MB (82546GB)
+product INTEL 82541GI_LF	0x107C	PRO/1000GT (82541GI)
+product INTEL 82546GB_PCIE	0x108A	PRO/1000MT (82546GB)
+product INTEL 82573E		0x108B	PRO/1000MT (82573E)
+product INTEL 82573E_IAMT	0x108C	PRO/1000MT (82573E)
+product INTEL 82546GB_QUAD_COPPER 0x1099	PRO/1000MT QP (82546GB)
 product INTEL 82815_DC100_HUB	0x1100	82815 Hub
 product INTEL 82815_DC100_AGP	0x1101	82815 AGP
 product INTEL 82815_DC100_GRAPH	0x1102	82815 Graphics