d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sfxge(4): remove EFSYS_OPT_PHY_NULL

Browse Source 
Submitted by:   Andy Moreton <amoreton at solarflare.com>
Sponsored by:   Solarflare Communications, Inc.
MFC after:      1 week
This commit is contained in:
arybchik 2016-05-10 07:15:57 +00:00
parent aa6936fa58
commit c459816487
2 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/sfxge/common/efx_check.h
View File

@ -47,7 +47,6 @@
# error "FALCON is obsolete and is not supported."
#else
/* FIXME: remove this after Falcon support has been removed */
#define EFSYS_OPT_PHY_NULL (0)
#define EFSYS_OPT_PHY_QT2022C2 (0)
#define EFSYS_OPT_PHY_QT2025C (0)
#define EFSYS_OPT_PHY_SFT9001 (0)
@ -243,12 +242,9 @@
# endif
#endif /* EFSYS_OPT_PHY_LED_CONTROL */
/* Support NULL PHY */
#if EFSYS_OPT_PHY_NULL
# if !EFSYS_OPT_FALCON
# error "PHY_NULL requires FALCON"
# endif
#endif /* EFSYS_OPT_PHY_NULL */
#ifdef EFSYS_OPT_PHY_NULL
# error "PHY_NULL is obsolete and is not supported."
#endif
/* Obsolete option */
#ifdef EFSYS_OPT_PHY_PM8358

32
sys/dev/sfxge/common/efx_phy.c
View File

@ -34,10 +34,6 @@ __FBSDID("$FreeBSD$");
#include "efx.h"
#include "efx_impl.h"
#if EFSYS_OPT_PHY_NULL
#include "nullphy.h"
#endif
#if EFSYS_OPT_PHY_QT2022C2
#include "qt2022c2.h"
#endif
@ -58,34 +54,6 @@ __FBSDID("$FreeBSD$");
#include "qt2025c.h"
#endif
#if EFSYS_OPT_PHY_NULL
static efx_phy_ops_t __efx_phy_null_ops = {
NULL, /* epo_power */
nullphy_reset, /* epo_reset */
nullphy_reconfigure, /* epo_reconfigure */
nullphy_verify, /* epo_verify */
NULL, /* epo_uplink_check */
nullphy_downlink_check, /* epo_downlink_check */
nullphy_oui_get, /* epo_oui_get */
#if EFSYS_OPT_PHY_STATS
nullphy_stats_update, /* epo_stats_update */
#endif /* EFSYS_OPT_PHY_STATS */
#if EFSYS_OPT_PHY_PROPS
#if EFSYS_OPT_NAMES
nullphy_prop_name, /* epo_prop_name */
#endif
nullphy_prop_get, /* epo_prop_get */
nullphy_prop_set, /* epo_prop_set */
#endif /* EFSYS_OPT_PHY_PROPS */
#if EFSYS_OPT_BIST
NULL, /* epo_bist_enable_offline */
NULL, /* epo_bist_start */
NULL, /* epo_bist_poll */
NULL, /* epo_bist_stop */
#endif /* EFSYS_OPT_BIST */
};
#endif /* EFSYS_OPT_PHY_NULL */
#if EFSYS_OPT_PHY_QT2022C2
static efx_phy_ops_t __efx_phy_qt2022c2_ops = {
NULL, /* epo_power */