d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Methodise the BT diversity configuration function; so the AR9285

Browse Source 
can correctly override it.

This was missed in the previous commit.
This commit is contained in:
adrian 2012-12-04 00:02:46 +00:00
parent 787563d5c4
commit a726c7af5b
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/ath/ath_hal/ar5416/ar5416.h
View File

@ -107,6 +107,9 @@ struct ath_hal_5416 {
void (*ah_initPLL) (struct ath_hal *ah, void (*ah_initPLL) (struct ath_hal *ah,
const struct ieee80211_channel *chan); const struct ieee80211_channel *chan);
/* bluetooth coexistence operations */
void (*ah_btCoexSetDiversity)(struct ath_hal *ah);
u_int ah_globaltxtimeout; /* global tx timeout */ u_int ah_globaltxtimeout; /* global tx timeout */
u_int ah_gpioMask; u_int ah_gpioMask;
int ah_hangs; /* h/w hangs state */ int ah_hangs; /* h/w hangs state */
@ -200,6 +203,7 @@ extern void ar5416SetBTCoexInfo(struct ath_hal *ah,
HAL_BT_COEX_INFO *btinfo); HAL_BT_COEX_INFO *btinfo);
extern void ar5416BTCoexConfig(struct ath_hal *ah, extern void ar5416BTCoexConfig(struct ath_hal *ah,
HAL_BT_COEX_CONFIG *btconf); HAL_BT_COEX_CONFIG *btconf);
extern void ar5416BTCoexAntennaDiversity(struct ath_hal *ah);
extern void ar5416BTCoexSetQcuThresh(struct ath_hal *ah, int qnum); extern void ar5416BTCoexSetQcuThresh(struct ath_hal *ah, int qnum);
extern void ar5416BTCoexSetWeights(struct ath_hal *ah, uint32_t stompType); extern void ar5416BTCoexSetWeights(struct ath_hal *ah, uint32_t stompType);
extern void ar5416BTCoexSetupBmissThresh(struct ath_hal *ah, extern void ar5416BTCoexSetupBmissThresh(struct ath_hal *ah,

1
sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
View File

@ -200,6 +200,7 @@ ar5416InitState(struct ath_hal_5416 *ahp5416, uint16_t devid, HAL_SOFTC sc,
ah->ah_btcoexSetParameter = ar5416BTCoexSetParameter; ah->ah_btcoexSetParameter = ar5416BTCoexSetParameter;
ah->ah_btCoexDisable = ar5416BTCoexDisable; ah->ah_btCoexDisable = ar5416BTCoexDisable;
ah->ah_btCoexEnable = ar5416BTCoexEnable; ah->ah_btCoexEnable = ar5416BTCoexEnable;
AH5416(ah)->ah_btCoexSetDiversity = ar5416BTCoexAntennaDiversity;
ahp->ah_priv.ah_getWirelessModes= ar5416GetWirelessModes; ahp->ah_priv.ah_getWirelessModes= ar5416GetWirelessModes;
ahp->ah_priv.ah_eepromRead = ar5416EepromRead; ahp->ah_priv.ah_eepromRead = ar5416EepromRead;

10
sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.c
View File

@ -173,7 +173,7 @@ ar5416BTCoexSetupBmissThresh(struct ath_hal *ah, u_int32_t thresh)
* *
* Kite will override this particular method. * Kite will override this particular method.
*/ */
static void void
ar5416BTCoexAntennaDiversity(struct ath_hal *ah) ar5416BTCoexAntennaDiversity(struct ath_hal *ah)
{ {
} }
@ -350,8 +350,12 @@ ar5416InitBTCoex(struct ath_hal *ah)
ar5416GpioCfgInput(ah, ahp->ah_btActiveGpioSelect); ar5416GpioCfgInput(ah, ahp->ah_btActiveGpioSelect);
ar5416GpioCfgInput(ah, ahp->ah_btPriorityGpioSelect); ar5416GpioCfgInput(ah, ahp->ah_btPriorityGpioSelect);
if (AR_SREV_KITE(ah)) /*
ar5416BTCoexAntennaDiversity(ah); * Configure the antenna diversity setup.
* It's a no-op for AR9287; AR9285 overrides this
* as required.
*/
AH5416(ah)->ah_btCoexSetDiversity(ah);
if (ahp->ah_btCoexEnabled) if (ahp->ah_btCoexEnabled)
ar5416BTCoexEnable(ah); ar5416BTCoexEnable(ah);