From 615a867ff2628b78899e46fe73f224232e057cc8 Mon Sep 17 00:00:00 2001 From: Adrian Chadd Date: Sun, 5 Jun 2016 02:16:16 +0000 Subject: [PATCH] [ath_hal] teach the reset path(s) about Jupiter 2.1. This was just .. not programming in things, and thus large chunks of the radio wouldn't work. Notably, 5GHz didn't work. --- sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c index ee16ca02a7a6..4da99cf207e9 100644 --- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c +++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c @@ -3000,7 +3000,7 @@ ar9300_process_ini(struct ath_hal *ah, struct ieee80211_channel *chan, ar9300_prog_ini(ah, &ahp->ah_ini_mac[i], modes_index); ar9300_prog_ini(ah, &ahp->ah_ini_bb[i], modes_index); ar9300_prog_ini(ah, &ahp->ah_ini_radio[i], modes_index); - if ((i == ATH_INI_POST) && (AR_SREV_JUPITER_20(ah) || AR_SREV_APHRODITE(ah))) { + if ((i == ATH_INI_POST) && (AR_SREV_JUPITER_20_OR_LATER(ah) || AR_SREV_APHRODITE(ah))) { ar9300_prog_ini(ah, &ahp->ah_ini_radio_post_sys2ant, modes_index); } @@ -3118,7 +3118,8 @@ ar9300_process_ini(struct ath_hal *ah, struct ieee80211_channel *chan, } #if 0 - if (AR_SREV_JUPITER_20(ah) || AR_SREV_APHRODITE(ah)) { + /* XXX TODO! */ + if (AR_SREV_JUPITER_20_OR_LATER(ah) || AR_SREV_APHRODITE(ah)) { ar9300_prog_ini(ah, &ahp->ah_ini_BTCOEX_MAX_TXPWR, 1); } #endif @@ -4497,7 +4498,7 @@ ar9300_reset(struct ath_hal *ah, HAL_OPMODE opmode, struct ieee80211_channel *ch #if ATH_SUPPORT_MCI if (AH_PRIVATE(ah)->ah_caps.halMciSupport && - (AR_SREV_JUPITER_20(ah) || AR_SREV_APHRODITE(ah))) + (AR_SREV_JUPITER_20_OR_LATER(ah) || AR_SREV_APHRODITE(ah))) { ar9300_mci_2g5g_changed(ah, IEEE80211_IS_CHAN_2GHZ(chan)); }