Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 10 May 2016 07:21:14 +0000 (UTC)
From:      Andrew Rybchenko <arybchik@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r299336 - head/sys/dev/sfxge/common
Message-ID:  <201605100721.u4A7LEV5018319@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: arybchik
Date: Tue May 10 07:21:14 2016
New Revision: 299336
URL: https://svnweb.freebsd.org/changeset/base/299336

Log:
  sfxge(4): remove EFSYS_OPT_PHY_TXC43128
  
  Submitted by:   Andy Moreton <amoreton at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.
  MFC after:      1 week

Modified:
  head/sys/dev/sfxge/common/efx_check.h
  head/sys/dev/sfxge/common/efx_impl.h
  head/sys/dev/sfxge/common/efx_phy.c

Modified: head/sys/dev/sfxge/common/efx_check.h
==============================================================================
--- head/sys/dev/sfxge/common/efx_check.h	Tue May 10 07:20:18 2016	(r299335)
+++ head/sys/dev/sfxge/common/efx_check.h	Tue May 10 07:21:14 2016	(r299336)
@@ -45,9 +45,6 @@
 
 #ifdef EFSYS_OPT_FALCON
 # error "FALCON is obsolete and is not supported."
-#else
-/* FIXME: remove this after Falcon support has been removed */
-#define	EFSYS_OPT_PHY_TXC43128			(0)
 #endif
 
 /* Support NVRAM based boot config */
@@ -277,12 +274,9 @@
 # endif
 #endif /* EFSYS_OPT_PHY_STATS */
 
-/* Support TXC43128 PHY (SFE4003 NIC) */
-#if EFSYS_OPT_PHY_TXC43128
-# if !EFSYS_OPT_FALCON
-#  error "PHY_TXC43128 requires FALCON"
-# endif
-#endif /* EFSYS_OPT_PHY_TXC43128 */
+#ifdef EFSYS_OPT_PHY_TXC43128
+# error "PHY_TXC43128 is obsolete and is not supported."
+#endif
 
 /* Support EVQ/RXQ/TXQ statistics */
 #if EFSYS_OPT_QSTATS

Modified: head/sys/dev/sfxge/common/efx_impl.h
==============================================================================
--- head/sys/dev/sfxge/common/efx_impl.h	Tue May 10 07:20:18 2016	(r299335)
+++ head/sys/dev/sfxge/common/efx_impl.h	Tue May 10 07:21:14 2016	(r299336)
@@ -301,13 +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
-	union {
-		struct {
-			unsigned int	bug10934_count;
-		} ep_txc43128;
-	};
-#endif
 	boolean_t		ep_mac_poll_needed; /* falcon only */
 	boolean_t		ep_mac_up; /* falcon only */
 	uint32_t		ep_fwver; /* falcon only */

Modified: head/sys/dev/sfxge/common/efx_phy.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_phy.c	Tue May 10 07:20:18 2016	(r299335)
+++ head/sys/dev/sfxge/common/efx_phy.c	Tue May 10 07:21:14 2016	(r299336)
@@ -34,37 +34,6 @@ __FBSDID("$FreeBSD$");
 #include "efx.h"
 #include "efx_impl.h"
 
-#if EFSYS_OPT_PHY_TXC43128
-#include "txc43128.h"
-#endif
-
-#if EFSYS_OPT_PHY_TXC43128
-static efx_phy_ops_t	__efx_phy_txc43128_ops = {
-	NULL,				/* epo_power */
-	txc43128_reset,			/* epo_reset */
-	txc43128_reconfigure,		/* epo_reconfigure */
-	txc43128_verify,		/* epo_verify */
-	txc43128_uplink_check,		/* epo_uplink_check */
-	txc43128_downlink_check,	/* epo_downlink_check */
-	txc43128_oui_get,		/* epo_oui_get */
-#if EFSYS_OPT_PHY_STATS
-	txc43128_stats_update,		/* epo_stats_update */
-#endif	/* EFSYS_OPT_PHY_STATS */
-#if EFSYS_OPT_PHY_PROPS
-#if EFSYS_OPT_NAMES
-	txc43128_prop_name,		/* epo_prop_name */
-#endif
-	txc43128_prop_get,		/* epo_prop_get */
-	txc43128_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_TXC43128 */
 
 #if EFSYS_OPT_SIENA
 static efx_phy_ops_t	__efx_phy_siena_ops = {

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605100721.u4A7LEV5018319>