Date: Thu, 27 Feb 2020 15:25:21 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r358389 - in head/sys/dev/sfxge: . common Message-ID: <202002271525.01RFPLMe086658@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Thu Feb 27 15:25:21 2020 New Revision: 358389 URL: https://svnweb.freebsd.org/changeset/base/358389 Log: Remove support for FreeBSD 7 and 8 Also, unifdef -DSFXGE_HAVE_DESCRIBE_INTR since it's now always defined. Modified: head/sys/dev/sfxge/common/efsys.h head/sys/dev/sfxge/sfxge.h head/sys/dev/sfxge/sfxge_intr.c Modified: head/sys/dev/sfxge/common/efsys.h ============================================================================== --- head/sys/dev/sfxge/common/efsys.h Thu Feb 27 15:22:18 2020 (r358388) +++ head/sys/dev/sfxge/common/efsys.h Thu Feb 27 15:25:21 2020 (r358389) @@ -72,11 +72,6 @@ extern "C" { #endif #include "efx_types.h" -/* Common code requires this */ -#if __FreeBSD_version < 800068 -#define memmove(d, s, l) bcopy(s, d, l) -#endif - #ifndef B_FALSE #define B_FALSE FALSE #endif @@ -88,7 +83,7 @@ extern "C" { #define ISP2(x) (((x) & ((x) - 1)) == 0) #endif -#if defined(__x86_64__) && __FreeBSD_version >= 1000000 +#if defined(__x86_64__) #define SFXGE_USE_BUS_SPACE_8 1 Modified: head/sys/dev/sfxge/sfxge.h ============================================================================== --- head/sys/dev/sfxge/sfxge.h Thu Feb 27 15:22:18 2020 (r358388) +++ head/sys/dev/sfxge/sfxge.h Thu Feb 27 15:25:21 2020 (r358389) @@ -93,11 +93,6 @@ #define IFM_40G_CR4 IFM_UNKNOWN #endif -#if (__FreeBSD_version >= 800501 && __FreeBSD_version < 900000) || \ - __FreeBSD_version >= 900003 -#define SFXGE_HAVE_DESCRIBE_INTR -#endif - #ifdef IFM_ETH_RXPAUSE #define SFXGE_HAVE_PAUSE_MEDIAOPTS #endif Modified: head/sys/dev/sfxge/sfxge_intr.c ============================================================================== --- head/sys/dev/sfxge/sfxge_intr.c Thu Feb 27 15:22:18 2020 (r358388) +++ head/sys/dev/sfxge/sfxge_intr.c Thu Feb 27 15:25:21 2020 (r358389) @@ -195,11 +195,9 @@ sfxge_intr_bus_enable(struct sfxge_softc *sc) sc->evq[index], &table[index].eih_tag)) != 0) { goto fail; } -#ifdef SFXGE_HAVE_DESCRIBE_INTR if (intr->n_alloc > 1) bus_describe_intr(sc->dev, table[index].eih_res, table[index].eih_tag, "%d", index); -#endif #ifdef RSS bus_bind_intr(sc->dev, table[index].eih_res, rss_getcpu(index));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002271525.01RFPLMe086658>