diff options
| author | adrian <adrian@FreeBSD.org> | 2016-05-31 04:17:17 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2016-05-31 04:17:17 +0000 |
| commit | dc478684386bced585b8f4cccbd851f541f222ca (patch) | |
| tree | 9e7bf9e21ec5737f171411ae17b7f793990c32f1 /sys | |
| parent | 60654647549638226a0040ac3c9339f86c38c89c (diff) | |
| download | FreeBSD-src-dc478684386bced585b8f4cccbd851f541f222ca.zip FreeBSD-src-dc478684386bced585b8f4cccbd851f541f222ca.tar.gz | |
[ath] ensure the right methods / options get overridden for MCI bluetooth coex
It turns out that the srev checks can't be done in the early attach
in ar9300_freebsd.c, because the poweron and srev check hasn't yet
happened.
So:
* Re-add the MCI overrides in attach
* Add QCA9565 (Aphrodite) check for the LNA diversity stuff.
Tested:
* QCA9565, STA mode + bluetooth
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c index f7f3ed7..96b5fd8 100644 --- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c +++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c @@ -723,10 +723,10 @@ ar9300_attach(u_int16_t devid, HAL_SOFTC sc, HAL_BUS_TAG st, #if ATH_SUPPORT_MCI if (AR_SREV_JUPITER(ah) || AR_SREV_APHRODITE(ah)) { -#if 0 - ah->ah_bt_coex_set_weights = ar9300_mci_bt_coex_set_weights; - ah->ah_bt_coex_disable = ar9300_mci_bt_coex_disable; - ah->ah_bt_coex_enable = ar9300_mci_bt_coex_enable; +#if 1 + ah->ah_btCoexSetWeights = ar9300_mci_bt_coex_set_weights; + ah->ah_btCoexDisable = ar9300_mci_bt_coex_disable; + ah->ah_btCoexEnable = ar9300_mci_bt_coex_enable; #endif ahp->ah_mci_ready = AH_FALSE; ahp->ah_mci_bt_state = MCI_BT_SLEEP; @@ -3033,7 +3033,7 @@ ar9300_fill_capability_info(struct ath_hal *ah) /* XXX is this a flag, or a chainmask number? */ p_cap->halApmEnable = !! ar9300_eeprom_get(ahp, EEP_CHAIN_MASK_REDUCE); #if ATH_ANT_DIV_COMB - if (AR_SREV_HORNET(ah) || AR_SREV_POSEIDON_11_OR_LATER(ah)) { + if (AR_SREV_HORNET(ah) || AR_SREV_POSEIDON_11_OR_LATER(ah) || AR_SREV_APHRODITE(ah)) { if (ahp->ah_diversity_control == HAL_ANT_VARIABLE) { u_int8_t ant_div_control1 = ar9300_eeprom_get(ahp, EEP_ANTDIV_control); |
