diff options
| author | arybchik <arybchik@FreeBSD.org> | 2016-06-04 14:37:36 +0000 |
|---|---|---|
| committer | arybchik <arybchik@FreeBSD.org> | 2016-06-04 14:37:36 +0000 |
| commit | 3b49dc3c46a75090d125dd6aa1772ebff5133059 (patch) | |
| tree | 71009928202f892f01c6ab086d5e3f27610ae574 /sys/dev/sfxge/common/efx_impl.h | |
| parent | f036275119517951dbc277ad3007021daf149597 (diff) | |
| download | FreeBSD-src-3b49dc3c46a75090d125dd6aa1772ebff5133059.zip FreeBSD-src-3b49dc3c46a75090d125dd6aa1772ebff5133059.tar.gz | |
MFC r299320-r299328, r299330-r299336
sfxge(4): remove EFSYS_OPT_FALCON and related EFSYS_OPT_ options
Submitted by: Andy Moreton <amoreton at solarflare.com>
Sponsored by: Solarflare Communications, Inc.
Diffstat (limited to 'sys/dev/sfxge/common/efx_impl.h')
| -rw-r--r-- | sys/dev/sfxge/common/efx_impl.h | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/sys/dev/sfxge/common/efx_impl.h b/sys/dev/sfxge/common/efx_impl.h index ff990bf..eb0097e 100644 --- a/sys/dev/sfxge/common/efx_impl.h +++ b/sys/dev/sfxge/common/efx_impl.h @@ -45,10 +45,6 @@ #endif -#if EFSYS_OPT_FALCON -#include "falcon_impl.h" -#endif /* EFSYS_OPT_FALCON */ - #if EFSYS_OPT_SIENA #include "siena_impl.h" #endif /* EFSYS_OPT_SIENA */ @@ -305,16 +301,6 @@ typedef struct efx_port_s { uint32_t ep_lp_cap_mask; uint32_t ep_default_adv_cap_mask; uint32_t ep_phy_cap_mask; -#if EFSYS_OPT_PHY_TXC43128 || EFSYS_OPT_PHY_QT2025C - union { - struct { - unsigned int bug10934_count; - } ep_txc43128; - struct { - unsigned int bug17190_count; - } ep_qt2025c; - }; -#endif boolean_t ep_mac_poll_needed; /* falcon only */ boolean_t ep_mac_up; /* falcon only */ uint32_t ep_fwver; /* falcon only */ @@ -443,9 +429,9 @@ typedef struct falconsiena_filter_s { } falconsiena_filter_t; typedef struct efx_filter_s { -#if EFSYS_OPT_FALCON || EFSYS_OPT_SIENA +#if EFSYS_OPT_SIENA falconsiena_filter_t *ef_falconsiena_filter; -#endif /* EFSYS_OPT_FALCON || EFSYS_OPT_SIENA */ +#endif /* EFSYS_OPT_SIENA */ #if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD ef10_filter_table_t *ef_ef10_filter_table; #endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD */ @@ -668,21 +654,6 @@ struct efx_nic_s { efx_lic_ops_t *en_elop; #endif union { -#if EFSYS_OPT_FALCON - struct { - falcon_spi_dev_t enu_fsd[FALCON_SPI_NTYPES]; - falcon_i2c_t enu_fip; - boolean_t enu_i2c_locked; -#if EFSYS_OPT_FALCON_NIC_CFG_OVERRIDE - const uint8_t *enu_forced_cfg; -#endif /* EFSYS_OPT_FALCON_NIC_CFG_OVERRIDE */ - uint8_t enu_mon_devid; - uint16_t enu_board_rev; - boolean_t enu_internal_sram; - uint8_t enu_sram_num_bank; - uint8_t enu_sram_bank_size; - } falcon; -#endif /* EFSYS_OPT_FALCON */ #if EFSYS_OPT_SIENA struct { #if EFSYS_OPT_NVRAM || EFSYS_OPT_VPD |
