Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/pci Modify WMP_F_1000{X, T} to WMP_F_{FIBER, COPPER}. ...
details: https://anonhg.NetBSD.org/src/rev/cd4f509536d3
branches: trunk
changeset: 331838:cd4f509536d3
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Tue Aug 26 14:44:00 2014 +0000
description:
Modify WMP_F_1000{X,T} to WMP_F_{FIBER,COPPER}. No binary change.
diffstat:
sys/dev/pci/if_wm.c | 228 ++++++++++++++++++++++++++--------------------------
1 files changed, 114 insertions(+), 114 deletions(-)
diffs (truncated from 590 to 300 lines):
diff -r 9269f902bc9f -r cd4f509536d3 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c Tue Aug 26 12:14:14 2014 +0000
+++ b/sys/dev/pci/if_wm.c Tue Aug 26 14:44:00 2014 +0000
@@ -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 @@
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 @@
{ 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 @@
{ 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 @@
{ 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 @@
{ 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 @@
{ 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 @@
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801H_M_AMT,
"Intel i82801H (M_AMT) LAN Controller",
- WM_T_ICH8, WMP_F_1000T },
Home |
Main Index |
Thread Index |
Old Index