From adc1d71c8b60750b3289fb371ae3eededd35398f Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Thu, 27 Feb 2020 15:25:21 +0000 Subject: [PATCH] Remove support for FreeBSD 7 and 8 Also, unifdef -DSFXGE_HAVE_DESCRIBE_INTR since it's now always defined. --- sys/dev/sfxge/common/efsys.h | 7 +------ sys/dev/sfxge/sfxge.h | 5 ----- sys/dev/sfxge/sfxge_intr.c | 2 -- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/sys/dev/sfxge/common/efsys.h b/sys/dev/sfxge/common/efsys.h index 09825cd2356..5c9a9ba82a5 100644 --- a/sys/dev/sfxge/common/efsys.h +++ b/sys/dev/sfxge/common/efsys.h @@ -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 diff --git a/sys/dev/sfxge/sfxge.h b/sys/dev/sfxge/sfxge.h index e5e88831147..1ffac1458dc 100644 --- a/sys/dev/sfxge/sfxge.h +++ b/sys/dev/sfxge/sfxge.h @@ -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 diff --git a/sys/dev/sfxge/sfxge_intr.c b/sys/dev/sfxge/sfxge_intr.c index bcff90b23f4..ebd772ccb69 100644 --- a/sys/dev/sfxge/sfxge_intr.c +++ b/sys/dev/sfxge/sfxge_intr.c @@ -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));