summaryrefslogtreecommitdiff
path: root/sys/dev/pci
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2006-06-22 04:50:32 +0000
committerBrad Smith <brad@cvs.openbsd.org>2006-06-22 04:50:32 +0000
commit963f664175ba5a8467f11cd1ee18dc1e0146aec5 (patch)
tree07397cd9c9c3bf41cb4298704177b3bf1a073c92 /sys/dev/pci
parentcac36e311ca87eafd5965e3b8f2ae006cacedf2e (diff)
identify CX4 based hardware.
From Intel's FreeBSD driver via their web-site.
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/ixgb_hw.c14
-rw-r--r--sys/dev/pci/ixgb_ids.h3
2 files changed, 15 insertions, 2 deletions
diff --git a/sys/dev/pci/ixgb_hw.c b/sys/dev/pci/ixgb_hw.c
index d2d5b910e0a..49de8d16840 100644
--- a/sys/dev/pci/ixgb_hw.c
+++ b/sys/dev/pci/ixgb_hw.c
@@ -31,7 +31,7 @@
*******************************************************************************/
-/* $OpenBSD: ixgb_hw.c,v 1.1 2005/11/14 23:25:43 brad Exp $ */
+/* $OpenBSD: ixgb_hw.c,v 1.2 2006/06/22 04:50:31 brad Exp $ */
/* ixgb_hw.c
* Shared functions for accessing and configuring the adapter
@@ -255,6 +255,18 @@ ixgb_identify_phy(struct ixgb_hw *hw)
phy_type = ixgb_phy_type_g6104;
break;
+ case IXGB_DEVICE_ID_82597EX_CX4:
+ DEBUGOUT("Identified CX4\n");
+ xpak_vendor = ixgb_identify_xpak_vendor(hw);
+ if(xpak_vendor == ixgb_xpak_vendor_intel) {
+ DEBUGOUT("Identified TXN17201 optics\n");
+ phy_type = ixgb_phy_type_txn17201;
+ } else {
+ DEBUGOUT("Identified G6005 optics\n");
+ phy_type = ixgb_phy_type_g6005;
+ }
+ break;
+
default:
DEBUGOUT("Unknown physical layer module\n");
phy_type = ixgb_phy_type_unknown;
diff --git a/sys/dev/pci/ixgb_ids.h b/sys/dev/pci/ixgb_ids.h
index bb562efc67c..285be0c188d 100644
--- a/sys/dev/pci/ixgb_ids.h
+++ b/sys/dev/pci/ixgb_ids.h
@@ -31,7 +31,7 @@
*******************************************************************************/
-/* $OpenBSD: ixgb_ids.h,v 1.1 2005/11/14 23:25:43 brad Exp $ */
+/* $OpenBSD: ixgb_ids.h,v 1.2 2006/06/22 04:50:31 brad Exp $ */
#ifndef _IXGB_IDS_H_
#define _IXGB_IDS_H_
@@ -51,6 +51,7 @@
#define IXGB_DEVICE_ID_82597EX_CX4 0x109E
#define IXGB_SUBDEVICE_ID_A00C 0xA00C
+#define IXGB_SUBDEVICE_ID_A01C 0xA01C
#endif /* #ifndef _IXGB_IDS_H_ */
/* End of File */