Module Name: src
Committed By: msaitoh
Date: Tue Aug 26 14:44:00 UTC 2014
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Modify WMP_F_1000{X,T} to WMP_F_{FIBER,COPPER}. No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.290 -r1.291 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.290 src/sys/dev/pci/if_wm.c:1.291
--- src/sys/dev/pci/if_wm.c:1.290 Sun Aug 24 21:15:35 2014
+++ src/sys/dev/pci/if_wm.c Tue Aug 26 14:44:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.290 2014/08/24 21:15:35 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.291 2014/08/26 14:44:00 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.290 2014/08/24 21:15:35 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.291 2014/08/26 14:44:00 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -719,69 +719,69 @@ static const struct wm_product {
const char *wmp_name;
wm_chip_type wmp_type;
int wmp_flags;
-#define WMP_F_1000X 0x01
-#define WMP_F_1000T 0x02
+#define WMP_F_FIBER 0x01
+#define WMP_F_COPPER 0x02
#define WMP_F_SERDES 0x04
} wm_products[] = {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82542,
"Intel i82542 1000BASE-X Ethernet",
- WM_T_82542_2_1, WMP_F_1000X },
+ WM_T_82542_2_1, WMP_F_FIBER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC_FIBER,
"Intel i82543GC 1000BASE-X Ethernet",
- WM_T_82543, WMP_F_1000X },
+ WM_T_82543, WMP_F_FIBER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC_COPPER,
"Intel i82543GC 1000BASE-T Ethernet",
- WM_T_82543, WMP_F_1000T },
+ WM_T_82543, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI_COPPER,
"Intel i82544EI 1000BASE-T Ethernet",
- WM_T_82544, WMP_F_1000T },
+ WM_T_82544, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI_FIBER,
"Intel i82544EI 1000BASE-X Ethernet",
- WM_T_82544, WMP_F_1000X },
+ WM_T_82544, WMP_F_FIBER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544GC_COPPER,
"Intel i82544GC 1000BASE-T Ethernet",
- WM_T_82544, WMP_F_1000T },
+ WM_T_82544, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544GC_LOM,
"Intel i82544GC (LOM) 1000BASE-T Ethernet",
- WM_T_82544, WMP_F_1000T },
+ WM_T_82544, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EM,
"Intel i82540EM 1000BASE-T Ethernet",
- WM_T_82540, WMP_F_1000T },
+ WM_T_82540, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EM_LOM,
"Intel i82540EM (LOM) 1000BASE-T Ethernet",
- WM_T_82540, WMP_F_1000T },
+ WM_T_82540, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP_LOM,
"Intel i82540EP 1000BASE-T Ethernet",
- WM_T_82540, WMP_F_1000T },
+ WM_T_82540, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP,
"Intel i82540EP 1000BASE-T Ethernet",
- WM_T_82540, WMP_F_1000T },
+ WM_T_82540, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP_LP,
"Intel i82540EP 1000BASE-T Ethernet",
- WM_T_82540, WMP_F_1000T },
+ WM_T_82540, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545EM_COPPER,
"Intel i82545EM 1000BASE-T Ethernet",
- WM_T_82545, WMP_F_1000T },
+ WM_T_82545, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545GM_COPPER,
"Intel i82545GM 1000BASE-T Ethernet",
- WM_T_82545_3, WMP_F_1000T },
+ WM_T_82545_3, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545GM_FIBER,
"Intel i82545GM 1000BASE-X Ethernet",
- WM_T_82545_3, WMP_F_1000X },
+ WM_T_82545_3, WMP_F_FIBER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545GM_SERDES,
"Intel i82545GM Gigabit Ethernet (SERDES)",
@@ -789,27 +789,27 @@ static const struct wm_product {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_COPPER,
"Intel i82546EB 1000BASE-T Ethernet",
- WM_T_82546, WMP_F_1000T },
+ WM_T_82546, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_QUAD,
"Intel i82546EB 1000BASE-T Ethernet",
- WM_T_82546, WMP_F_1000T },
+ WM_T_82546, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545EM_FIBER,
"Intel i82545EM 1000BASE-X Ethernet",
- WM_T_82545, WMP_F_1000X },
+ WM_T_82545, WMP_F_FIBER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_FIBER,
"Intel i82546EB 1000BASE-X Ethernet",
- WM_T_82546, WMP_F_1000X },
+ WM_T_82546, WMP_F_FIBER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_COPPER,
"Intel i82546GB 1000BASE-T Ethernet",
- WM_T_82546_3, WMP_F_1000T },
+ WM_T_82546_3, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_FIBER,
"Intel i82546GB 1000BASE-X Ethernet",
- WM_T_82546_3, WMP_F_1000X },
+ WM_T_82546_3, WMP_F_FIBER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_SERDES,
"Intel i82546GB Gigabit Ethernet (SERDES)",
@@ -817,63 +817,63 @@ static const struct wm_product {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_QUAD_COPPER,
"i82546GB quad-port Gigabit Ethernet",
- WM_T_82546_3, WMP_F_1000T },
+ WM_T_82546_3, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_QUAD_COPPER_KSP3,
"i82546GB quad-port Gigabit Ethernet (KSP3)",
- WM_T_82546_3, WMP_F_1000T },
+ WM_T_82546_3, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_PCIE,
"Intel PRO/1000MT (82546GB)",
- WM_T_82546_3, WMP_F_1000T },
+ WM_T_82546_3, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI,
"Intel i82541EI 1000BASE-T Ethernet",
- WM_T_82541, WMP_F_1000T },
+ WM_T_82541, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541ER_LOM,
"Intel i82541ER (LOM) 1000BASE-T Ethernet",
- WM_T_82541, WMP_F_1000T },
+ WM_T_82541, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_MOBILE,
"Intel i82541EI Mobile 1000BASE-T Ethernet",
- WM_T_82541, WMP_F_1000T },
+ WM_T_82541, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541ER,
"Intel i82541ER 1000BASE-T Ethernet",
- WM_T_82541_2, WMP_F_1000T },
+ WM_T_82541_2, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541GI,
"Intel i82541GI 1000BASE-T Ethernet",
- WM_T_82541_2, WMP_F_1000T },
+ WM_T_82541_2, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541GI_MOBILE,
"Intel i82541GI Mobile 1000BASE-T Ethernet",
- WM_T_82541_2, WMP_F_1000T },
+ WM_T_82541_2, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541PI,
"Intel i82541PI 1000BASE-T Ethernet",
- WM_T_82541_2, WMP_F_1000T },
+ WM_T_82541_2, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI,
"Intel i82547EI 1000BASE-T Ethernet",
- WM_T_82547, WMP_F_1000T },
+ WM_T_82547, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI_MOBILE,
"Intel i82547EI Mobile 1000BASE-T Ethernet",
- WM_T_82547, WMP_F_1000T },
+ WM_T_82547, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547GI,
"Intel i82547GI 1000BASE-T Ethernet",
- WM_T_82547_2, WMP_F_1000T },
+ WM_T_82547_2, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82571EB_COPPER,
"Intel PRO/1000 PT (82571EB)",
- WM_T_82571, WMP_F_1000T },
+ WM_T_82571, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82571EB_FIBER,
"Intel PRO/1000 PF (82571EB)",
- WM_T_82571, WMP_F_1000X },
+ WM_T_82571, WMP_F_FIBER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82571EB_SERDES,
"Intel PRO/1000 PB (82571EB)",
@@ -881,19 +881,19 @@ static const struct wm_product {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82571EB_QUAD_COPPER,
"Intel PRO/1000 QT (82571EB)",
- WM_T_82571, WMP_F_1000T },
+ WM_T_82571, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82572EI_COPPER,
"Intel i82572EI 1000baseT Ethernet",
- WM_T_82572, WMP_F_1000T },
+ WM_T_82572, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82571GB_QUAD_COPPER,
"Intel PRO/1000 PT Quad Port Server Adapter",
- WM_T_82571, WMP_F_1000T, },
+ WM_T_82571, WMP_F_COPPER, },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82572EI_FIBER,
"Intel i82572EI 1000baseX Ethernet",
- WM_T_82572, WMP_F_1000X },
+ WM_T_82572, WMP_F_FIBER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82572EI_SERDES,
"Intel i82572EI Gigabit Ethernet (SERDES)",
@@ -901,35 +901,35 @@ static const struct wm_product {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82572EI,
"Intel i82572EI 1000baseT Ethernet",
- WM_T_82572, WMP_F_1000T },
+ WM_T_82572, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82573E,
"Intel i82573E",
- WM_T_82573, WMP_F_1000T },
+ WM_T_82573, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82573E_IAMT,
"Intel i82573E IAMT",
- WM_T_82573, WMP_F_1000T },
+ WM_T_82573, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82573L,
"Intel i82573L Gigabit Ethernet",
- WM_T_82573, WMP_F_1000T },
+ WM_T_82573, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82574L,
"Intel i82574L",
- WM_T_82574, WMP_F_1000T },
+ WM_T_82574, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82583V,
"Intel i82583V",
- WM_T_82583, WMP_F_1000T },
+ WM_T_82583, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_80K3LAN_CPR_DPT,
"i80003 dual 1000baseT Ethernet",
- WM_T_80003, WMP_F_1000T },
+ WM_T_80003, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_80K3LAN_FIB_DPT,
"i80003 dual 1000baseX Ethernet",
- WM_T_80003, WMP_F_1000T },
+ WM_T_80003, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_80K3LAN_SDS_DPT,
"Intel i80003ES2 dual Gigabit Ethernet (SERDES)",
@@ -937,7 +937,7 @@ static const struct wm_product {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_80K3LAN_CPR_SPT,
"Intel i80003 1000baseT Ethernet",
- WM_T_80003, WMP_F_1000T },
+ WM_T_80003, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_80K3LAN_SDS_SPT,
"Intel i80003 Gigabit Ethernet (SERDES)",
@@ -945,100 +945,100 @@ static const struct wm_product {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801H_M_AMT,
"Intel i82801H (M_AMT) LAN Controller",
- WM_T_ICH8, WMP_F_1000T },
+ WM_T_ICH8, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801H_AMT,
"Intel i82801H (AMT) LAN Controller",
- WM_T_ICH8, WMP_F_1000T },
+ WM_T_ICH8, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801H_LAN,
"Intel i82801H LAN Controller",
- WM_T_ICH8, WMP_F_1000T },
+ WM_T_ICH8, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801H_IFE_LAN,
"Intel i82801H (IFE) LAN Controller",
- WM_T_ICH8, WMP_F_1000T },
+ WM_T_ICH8, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801H_M_LAN,
"Intel i82801H (M) LAN Controller",
- WM_T_ICH8, WMP_F_1000T },
+ WM_T_ICH8, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801H_IFE_GT,
"Intel i82801H IFE (GT) LAN Controller",
- WM_T_ICH8, WMP_F_1000T },
+ WM_T_ICH8, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801H_IFE_G,
"Intel i82801H IFE (G) LAN Controller",
- WM_T_ICH8, WMP_F_1000T },
+ WM_T_ICH8, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801I_IGP_AMT,
"82801I (AMT) LAN Controller",
- WM_T_ICH9, WMP_F_1000T },
+ WM_T_ICH9, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801I_IFE,
"82801I LAN Controller",
- WM_T_ICH9, WMP_F_1000T },
+ WM_T_ICH9, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801I_IFE_G,
"82801I (G) LAN Controller",
- WM_T_ICH9, WMP_F_1000T },
+ WM_T_ICH9, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801I_IFE_GT,
"82801I (GT) LAN Controller",
- WM_T_ICH9, WMP_F_1000T },
+ WM_T_ICH9, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801I_IGP_C,
"82801I (C) LAN Controller",
- WM_T_ICH9, WMP_F_1000T },
+ WM_T_ICH9, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801I_IGP_M,
"82801I mobile LAN Controller",
- WM_T_ICH9, WMP_F_1000T },
+ WM_T_ICH9, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801H_IGP_M_V,
"82801I mobile (V) LAN Controller",
- WM_T_ICH9, WMP_F_1000T },
+ WM_T_ICH9, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801I_IGP_M_AMT,
"82801I mobile (AMT) LAN Controller",
- WM_T_ICH9, WMP_F_1000T },
+ WM_T_ICH9, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801I_BM,
"82567LM-4 LAN Controller",
- WM_T_ICH9, WMP_F_1000T },
+ WM_T_ICH9, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801I_82567V_3,
"82567V-3 LAN Controller",
- WM_T_ICH9, WMP_F_1000T },
+ WM_T_ICH9, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801J_R_BM_LM,
"82567LM-2 LAN Controller",
- WM_T_ICH10, WMP_F_1000T },
+ WM_T_ICH10, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801J_R_BM_LF,
"82567LF-2 LAN Controller",
- WM_T_ICH10, WMP_F_1000T },
+ WM_T_ICH10, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801J_D_BM_LM,
"82567LM-3 LAN Controller",
- WM_T_ICH10, WMP_F_1000T },
+ WM_T_ICH10, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801J_D_BM_LF,
"82567LF-3 LAN Controller",
- WM_T_ICH10, WMP_F_1000T },
+ WM_T_ICH10, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801J_R_BM_V,
"82567V-2 LAN Controller",
- WM_T_ICH10, WMP_F_1000T },
+ WM_T_ICH10, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801J_D_BM_V,
"82567V-3? LAN Controller",
- WM_T_ICH10, WMP_F_1000T },
+ WM_T_ICH10, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_HANKSVILLE,
"HANKSVILLE LAN Controller",
- WM_T_ICH10, WMP_F_1000T },
+ WM_T_ICH10, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PCH_M_LM,
"PCH LAN (82577LM) Controller",
- WM_T_PCH, WMP_F_1000T },
+ WM_T_PCH, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PCH_M_LC,
"PCH LAN (82577LC) Controller",
- WM_T_PCH, WMP_F_1000T },
+ WM_T_PCH, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PCH_D_DM,
"PCH LAN (82578DM) Controller",
- WM_T_PCH, WMP_F_1000T },
+ WM_T_PCH, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PCH_D_DC,
"PCH LAN (82578DC) Controller",
- WM_T_PCH, WMP_F_1000T },
+ WM_T_PCH, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PCH2_LV_LM,
"PCH2 LAN (82579LM) Controller",
- WM_T_PCH2, WMP_F_1000T },
+ WM_T_PCH2, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PCH2_LV_V,
"PCH2 LAN (82579V) Controller",
- WM_T_PCH2, WMP_F_1000T },
+ WM_T_PCH2, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82575EB_COPPER,
"82575EB dual-1000baseT Ethernet",
- WM_T_82575, WMP_F_1000T },
+ WM_T_82575, WMP_F_COPPER },
#if 0
/*
- * not sure if WMP_F_1000X or WMP_F_SERDES - we do not have it - so
+ * not sure if WMP_F_FIBER or WMP_F_SERDES - we do not have it - so
* disabled for now ...
*/
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82575EB_FIBER_SERDES,
@@ -1047,16 +1047,16 @@ static const struct wm_product {
#endif
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82575GB_QUAD_COPPER,
"82575GB quad-1000baseT Ethernet",
- WM_T_82575, WMP_F_1000T },
+ WM_T_82575, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82575GB_QUAD_COPPER_PM,
"82575GB quad-1000baseT Ethernet (PM)",
- WM_T_82575, WMP_F_1000T },
+ WM_T_82575, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82576_COPPER,
"82576 1000BaseT Ethernet",
- WM_T_82576, WMP_F_1000T },
+ WM_T_82576, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82576_FIBER,
"82576 1000BaseX Ethernet",
- WM_T_82576, WMP_F_1000X },
+ WM_T_82576, WMP_F_FIBER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82576_SERDES,
"82576 gigabit Ethernet (SERDES)",
@@ -1064,10 +1064,10 @@ static const struct wm_product {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82576_QUAD_COPPER,
"82576 quad-1000BaseT Ethernet",
- WM_T_82576, WMP_F_1000T },
+ WM_T_82576, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82576_NS,
"82576 gigabit Ethernet",
- WM_T_82576, WMP_F_1000T },
+ WM_T_82576, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82576_NS_SERDES,
"82576 gigabit Ethernet (SERDES)",
@@ -1078,10 +1078,10 @@ static const struct wm_product {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_COPPER,
"82580 1000BaseT Ethernet",
- WM_T_82580, WMP_F_1000T },
+ WM_T_82580, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_FIBER,
"82580 1000BaseX Ethernet",
- WM_T_82580, WMP_F_1000X },
+ WM_T_82580, WMP_F_FIBER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_SERDES,
"82580 1000BaseT Ethernet (SERDES)",
@@ -1089,25 +1089,25 @@ static const struct wm_product {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_SGMII,
"82580 gigabit Ethernet (SGMII)",
- WM_T_82580, WMP_F_1000T },
+ WM_T_82580, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_COPPER_DUAL,
"82580 dual-1000BaseT Ethernet",
- WM_T_82580, WMP_F_1000T },
+ WM_T_82580, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_ER,
"82580 1000BaseT Ethernet",
- WM_T_82580ER, WMP_F_1000T },
+ WM_T_82580ER, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_ER_DUAL,
"82580 dual-1000BaseT Ethernet",
- WM_T_82580ER, WMP_F_1000T },
+ WM_T_82580ER, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_QUAD_FIBER,
"82580 quad-1000BaseX Ethernet",
- WM_T_82580, WMP_F_1000X },
+ WM_T_82580, WMP_F_FIBER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I350_COPPER,
"I350 Gigabit Network Connection",
- WM_T_I350, WMP_F_1000T },
+ WM_T_I350, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I350_FIBER,
"I350 Gigabit Fiber Network Connection",
- WM_T_I350, WMP_F_1000X },
+ WM_T_I350, WMP_F_FIBER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I350_SERDES,
"I350 Gigabit Backplane Connection",
@@ -1115,23 +1115,23 @@ static const struct wm_product {
#if 0
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I350_SGMII,
"I350 Gigabit Connection",
- WM_T_I350, WMP_F_1000T },
+ WM_T_I350, WMP_F_COPPER },
#endif
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C2000_SGMII,
"I354 Gigabit Connection",
- WM_T_I354, WMP_F_1000T },
+ WM_T_I354, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I210_T1,
"I210-T1 Ethernet Server Adapter",
- WM_T_I210, WMP_F_1000T },
+ WM_T_I210, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I210_COPPER_OEM1,
"I210 Ethernet (Copper OEM)",
- WM_T_I210, WMP_F_1000T },
+ WM_T_I210, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I210_COPPER_IT,
"I210 Ethernet (Copper IT)",
- WM_T_I210, WMP_F_1000T },
+ WM_T_I210, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I210_FIBER,
"I210 Gigabit Ethernet (Fiber)",
- WM_T_I210, WMP_F_1000X },
+ WM_T_I210, WMP_F_FIBER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I210_SERDES,
"I210 Gigabit Ethernet (SERDES)",
@@ -1143,19 +1143,19 @@ static const struct wm_product {
#endif
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I211_COPPER,
"I211 Ethernet (COPPER)",
- WM_T_I211, WMP_F_1000T },
+ WM_T_I211, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I217_V,
"I217 V Ethernet Connection",
- WM_T_PCH_LPT, WMP_F_1000T },
+ WM_T_PCH_LPT, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I217_LM,
"I217 LM Ethernet Connection",
- WM_T_PCH_LPT, WMP_F_1000T },
+ WM_T_PCH_LPT, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I218_V,
"I218 V Ethernet Connection",
- WM_T_PCH_LPT, WMP_F_1000T },
+ WM_T_PCH_LPT, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I218_LM,
"I218 LM Ethernet Connection",
- WM_T_PCH_LPT, WMP_F_1000T },
+ WM_T_PCH_LPT, WMP_F_COPPER },
{ 0, 0,
NULL,
0, 0 },
@@ -2018,7 +2018,7 @@ wm_attach(device_t parent, device_t self
wm_gmii_mediainit(sc, wmp->wmp_product);
} else if (sc->sc_type < WM_T_82543 ||
(CSR_READ(sc, WMREG_STATUS) & STATUS_TBIMODE) != 0) {
- if (wmp->wmp_flags & WMP_F_1000T)
+ if (wmp->wmp_flags & WMP_F_COPPER)
aprint_error_dev(sc->sc_dev,
"WARNING: TBIMODE set on 1000BASE-T product!\n");
wm_tbi_mediainit(sc);
@@ -2066,7 +2066,7 @@ wm_attach(device_t parent, device_t self
}
break;
default:
- if (wmp->wmp_flags & WMP_F_1000X)
+ if (wmp->wmp_flags & WMP_F_FIBER)
aprint_error_dev(sc->sc_dev,
"WARNING: TBIMODE clear on 1000BASE-X product!\n");
wm_gmii_mediainit(sc, wmp->wmp_product);
@@ -8954,7 +8954,7 @@ wm_enable_wakeup(struct wm_softc *sc)
}
/* Keep the laser running on fiber adapters */
- if (((sc->sc_wmp->wmp_flags & WMP_F_1000X) != 0)
+ if (((sc->sc_wmp->wmp_flags & WMP_F_FIBER) != 0)
|| (sc->sc_wmp->wmp_flags & WMP_F_SERDES) != 0) {
reg = CSR_READ(sc, WMREG_CTRL_EXT);
reg |= CTRL_EXT_SWDPIN(3);
