diff options
| author | jfv <jfv@FreeBSD.org> | 2014-07-28 21:11:18 +0000 |
|---|---|---|
| committer | jfv <jfv@FreeBSD.org> | 2014-07-28 21:11:18 +0000 |
| commit | 00e682104eb14211088566f56db127cc292bc3bf (patch) | |
| tree | e1e530888e00e37f9544ea33cebd0f8d60fd6d25 /sys/dev/e1000/e1000_phy.h | |
| parent | 37a9f7be2fd32cf24c75d466cacac9ce83a3766b (diff) | |
| download | FreeBSD-src-00e682104eb14211088566f56db127cc292bc3bf.zip FreeBSD-src-00e682104eb14211088566f56db127cc292bc3bf.tar.gz | |
MFC of R267935: Sync the E1000 shared code to Intel internal, and
more importantly add new I218 adapter support to em.
Diffstat (limited to 'sys/dev/e1000/e1000_phy.h')
| -rw-r--r-- | sys/dev/e1000/e1000_phy.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/e1000/e1000_phy.h b/sys/dev/e1000/e1000_phy.h index 32685ee..0e5b2e6 100644 --- a/sys/dev/e1000/e1000_phy.h +++ b/sys/dev/e1000/e1000_phy.h @@ -1,6 +1,6 @@ /****************************************************************************** - Copyright (c) 2001-2013, Intel Corporation + Copyright (c) 2001-2014, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without @@ -144,7 +144,6 @@ bool e1000_is_mphy_ready(struct e1000_hw *hw); #define GS40G_MAC_LB 0x4140 #define GS40G_MAC_SPEED_1G 0X0006 #define GS40G_COPPER_SPEC 0x0010 -#define GS40G_CS_POWER_DOWN 0x0002 /* BM/HV Specific Registers */ #define BM_PORT_CTRL_PAGE 769 @@ -226,6 +225,7 @@ bool e1000_is_mphy_ready(struct e1000_hw *hw); #define HV_M_STATUS_AUTONEG_COMPLETE 0x1000 #define HV_M_STATUS_SPEED_MASK 0x0300 #define HV_M_STATUS_SPEED_1000 0x0200 +#define HV_M_STATUS_SPEED_100 0x0100 #define HV_M_STATUS_LINK_UP 0x0040 #define IGP01E1000_PHY_PCS_INIT_REG 0x00B4 |
