From c4d3fad2ec1526f011052831734b97b78dc177a4 Mon Sep 17 00:00:00 2001 From: Sam Leffler Date: Thu, 19 Mar 2009 19:29:10 +0000 Subject: [PATCH] purge hal abi support; now that the hal is merged w/ the driver we cannot be out of sync MFC after: 1 week --- sys/dev/ath/ath_hal/ah.h | 2 -- sys/dev/ath/ath_hal/ar5210/ar5210_attach.c | 1 - sys/dev/ath/ath_hal/ar5211/ar5211_attach.c | 1 - sys/dev/ath/ath_hal/ar5212/ar5212_attach.c | 1 - sys/dev/ath/if_ath.c | 25 ------------- sys/dev/ath/if_athvar.h | 42 ---------------------- 6 files changed, 72 deletions(-) diff --git a/sys/dev/ath/ath_hal/ah.h b/sys/dev/ath/ath_hal/ah.h index da9060a8d98a..c1bff9c44ae2 100644 --- a/sys/dev/ath/ath_hal/ah.h +++ b/sys/dev/ath/ath_hal/ah.h @@ -598,8 +598,6 @@ struct ieee80211_channel; */ struct ath_hal { uint32_t ah_magic; /* consistency check magic number */ - uint32_t ah_abi; /* HAL ABI version */ -#define HAL_ABI_VERSION 0x08112800 /* YYMMDDnn */ uint16_t ah_devid; /* PCI device ID */ uint16_t ah_subvendorid; /* PCI subvendor ID */ HAL_SOFTC ah_sc; /* back pointer to driver/os state */ diff --git a/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c b/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c index 3df392486507..13ad7119ebf4 100644 --- a/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c +++ b/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c @@ -38,7 +38,6 @@ static void ar5210DisablePCIE(struct ath_hal *ah); static const struct ath_hal_private ar5210hal = {{ .ah_magic = AR5210_MAGIC, - .ah_abi = HAL_ABI_VERSION, .ah_getRateTable = ar5210GetRateTable, .ah_detach = ar5210Detach, diff --git a/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c b/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c index 81af95fad3eb..e55c67afad47 100644 --- a/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c +++ b/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c @@ -38,7 +38,6 @@ static void ar5211DisablePCIE(struct ath_hal *ah); static const struct ath_hal_private ar5211hal = {{ .ah_magic = AR5211_MAGIC, - .ah_abi = HAL_ABI_VERSION, .ah_getRateTable = ar5211GetRateTable, .ah_detach = ar5211Detach, diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c b/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c index 742523fa734b..300c0a3c09eb 100644 --- a/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c +++ b/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c @@ -34,7 +34,6 @@ static void ar5212DisablePCIE(struct ath_hal *ah); static const struct ath_hal_private ar5212hal = {{ .ah_magic = AR5212_MAGIC, - .ah_abi = HAL_ABI_VERSION, .ah_getRateTable = ar5212GetRateTable, .ah_detach = ar5212Detach, diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c index 7a59520f95ef..551c47b82c80 100644 --- a/sys/dev/ath/if_ath.c +++ b/sys/dev/ath/if_ath.c @@ -88,11 +88,6 @@ __FBSDID("$FreeBSD$"); #include #endif -/* - * We require a HAL w/ the changes for split tx/rx MIC. - */ -CTASSERT(HAL_ABI_VERSION > 0x06052200); - /* * ATH_BCBUF determines the number of vap's that can transmit * beacons and also (currently) the number of vap's that can @@ -380,13 +375,6 @@ ath_attach(u_int16_t devid, struct ath_softc *sc) error = ENXIO; goto bad; } - if (ah->ah_abi != HAL_ABI_VERSION) { - if_printf(ifp, "HAL ABI mismatch detected " - "(HAL:0x%x != driver:0x%x)\n", - ah->ah_abi, HAL_ABI_VERSION); - error = ENXIO; - goto bad; - } sc->sc_ah = ah; sc->sc_invalid = 0; /* ready to go, enable interrupt handling */ #ifdef ATH_DEBUG @@ -2689,17 +2677,8 @@ ath_calcrxfilter(struct ath_softc *sc) u_int32_t rfilt; rfilt = HAL_RX_FILTER_UCAST | HAL_RX_FILTER_BCAST | HAL_RX_FILTER_MCAST; -#if HAL_ABI_VERSION < 0x08011600 - rfilt |= (ath_hal_getrxfilter(sc->sc_ah) & - (HAL_RX_FILTER_PHYRADAR | HAL_RX_FILTER_PHYERR)); -#elif HAL_ABI_VERSION < 0x08060100 - if (ic->ic_opmode == IEEE80211_M_STA && - !sc->sc_needmib && !sc->sc_scanning) - rfilt |= HAL_RX_FILTER_PHYERR; -#else if (!sc->sc_needmib && !sc->sc_scanning) rfilt |= HAL_RX_FILTER_PHYERR; -#endif if (ic->ic_opmode != IEEE80211_M_STA) rfilt |= HAL_RX_FILTER_PROBEREQ; if (ic->ic_opmode == IEEE80211_M_MONITOR || (ifp->if_flags & IFF_PROMISC)) @@ -6273,10 +6252,6 @@ ath_rate_setup(struct ath_softc *sc, u_int mode) break; case IEEE80211_MODE_TURBO_A: rt = ath_hal_getratetable(ah, HAL_MODE_108A); -#if HAL_ABI_VERSION < 0x07013100 - if (rt == NULL) /* XXX bandaid for old hal's */ - rt = ath_hal_getratetable(ah, HAL_MODE_TURBO); -#endif break; case IEEE80211_MODE_TURBO_G: rt = ath_hal_getratetable(ah, HAL_MODE_108G); diff --git a/sys/dev/ath/if_athvar.h b/sys/dev/ath/if_athvar.h index 540b76a6bbd2..256c51f30f4c 100644 --- a/sys/dev/ath/if_athvar.h +++ b/sys/dev/ath/if_athvar.h @@ -462,16 +462,10 @@ void ath_intr(void *); ((*(_ah)->ah_setChannel)((_ah), (_chan))) #define ath_hal_calibrate(_ah, _chan, _iqcal) \ ((*(_ah)->ah_perCalibration)((_ah), (_chan), (_iqcal))) -#if HAL_ABI_VERSION >= 0x08111000 #define ath_hal_calibrateN(_ah, _chan, _lcal, _isdone) \ ((*(_ah)->ah_perCalibrationN)((_ah), (_chan), 0x1, (_lcal), (_isdone))) #define ath_hal_calreset(_ah, _chan) \ ((*(_ah)->ah_resetCalValid)((_ah), (_chan))) -#else -#define ath_hal_calibrateN(_ah, _chan, _lcal, _isdone) \ - ath_hal_calibrate(_ah, _chan, _isdone) -#define ath_hal_calreset(_ah, _chan) (0) -#endif #define ath_hal_setledstate(_ah, _state) \ ((*(_ah)->ah_setLedState)((_ah), (_state))) #define ath_hal_beaconinit(_ah, _nextb, _bperiod) \ @@ -545,19 +539,8 @@ void ath_intr(void *); (ath_hal_getcapability(_ah, HAL_CAP_CIPHER, _cipher, NULL) == HAL_OK) #define ath_hal_getregdomain(_ah, _prd) \ (ath_hal_getcapability(_ah, HAL_CAP_REG_DMN, 0, (_prd)) == HAL_OK) -#if HAL_ABI_VERSION < 0x08090100 -/* XXX wrong for anything but amd64 and i386 */ -#if defined(__LP64__) -#define ath_hal_setregdomain(_ah, _rd) \ - (*(uint16_t *)(((uint8_t *)&(_ah)[1]) + 176) = (_rd)) -#else -#define ath_hal_setregdomain(_ah, _rd) \ - (*(uint16_t *)(((uint8_t *)&(_ah)[1]) + 128) = (_rd)) -#endif -#else #define ath_hal_setregdomain(_ah, _rd) \ ath_hal_setcapability(_ah, HAL_CAP_REG_DMN, 0, _rd, NULL) -#endif #define ath_hal_getcountrycode(_ah, _pcc) \ (*(_pcc) = (_ah)->ah_countryCode) #define ath_hal_gettkipmic(_ah) \ @@ -656,31 +639,6 @@ void ath_intr(void *); ath_hal_setcapability(_ah, HAL_CAP_INTMIT, 1, _v, NULL) #define ath_hal_getchannoise(_ah, _c) \ ((*(_ah)->ah_getChanNoise)((_ah), (_c))) -#if HAL_ABI_VERSION < 0x05122200 -#define HAL_TXQ_TXOKINT_ENABLE TXQ_FLAG_TXOKINT_ENABLE -#define HAL_TXQ_TXERRINT_ENABLE TXQ_FLAG_TXERRINT_ENABLE -#define HAL_TXQ_TXDESCINT_ENABLE TXQ_FLAG_TXDESCINT_ENABLE -#define HAL_TXQ_TXEOLINT_ENABLE TXQ_FLAG_TXEOLINT_ENABLE -#define HAL_TXQ_TXURNINT_ENABLE TXQ_FLAG_TXURNINT_ENABLE -#endif -#if HAL_ABI_VERSION < 0x06102501 -#define ath_hal_ispublicsafetysku(ah) \ - (((ah)->ah_regdomain == 0 && (ah)->ah_countryCode == 842) || \ - (ah)->ah_regdomain == 0x12) -#endif -#if HAL_ABI_VERSION < 0x06122400 -/* XXX yech, can't get to regdomain so just hack a compat shim */ -#define ath_hal_isgsmsku(ah) \ - ((ah)->ah_countryCode == 843) -#endif -#if HAL_ABI_VERSION < 0x07050400 -/* compat shims so code compilers--it won't work though */ -#define CHANNEL_HT20 0x10000 -#define CHANNEL_HT40PLUS 0x20000 -#define CHANNEL_HT40MINUS 0x40000 -#define HAL_MODE_11NG_HT20 0x008000 -#define HAL_MODE_11NA_HT20 0x010000 -#endif #define ath_hal_setuprxdesc(_ah, _ds, _size, _intreq) \ ((*(_ah)->ah_setupRxDesc)((_ah), (_ds), (_size), (_intreq)))