Use the HAL API for returning ar5212AniState, rather than just dumping

AniState itself.
This commit is contained in:
Adrian Chadd 2015-04-01 04:56:22 +00:00
parent d5c3e61afb
commit b3ab2271b9
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=280942
2 changed files with 24 additions and 3 deletions

View File

@ -345,6 +345,7 @@ struct ath_hal_5212 {
uint32_t ah_txBusy;
uint32_t ah_rx_chainmask;
uint32_t ah_tx_chainmask;
HAL_ANI_STATE ext_ani_state;
};
#define AH5212(_ah) ((struct ath_hal_5212 *)(_ah))

View File

@ -1052,6 +1052,7 @@ ar5212GetDiagState(struct ath_hal *ah, int request,
void **result, uint32_t *resultsize)
{
struct ath_hal_5212 *ahp = AH5212(ah);
struct ar5212AniState *astate;
(void) ahp;
if (ath_hal_getdiagstate(ah, request, args, argsize, result, resultsize))
@ -1083,9 +1084,28 @@ ar5212GetDiagState(struct ath_hal *ah, int request,
0 : sizeof(struct ar5212AniState);
return AH_TRUE;
case HAL_DIAG_ANI_STATS:
*result = ar5212AniGetCurrentStats(ah);
*resultsize = (*result == AH_NULL) ?
0 : sizeof(HAL_ANI_STATS);
OS_MEMZERO(&ahp->ext_ani_state, sizeof(ahp->ext_ani_state));
astate = ar5212AniGetCurrentState(ah);
if (astate == NULL) {
*result = NULL;
*resultsize = 0;
} else {
ahp->ext_ani_state.noiseImmunityLevel =
astate->noiseImmunityLevel;
ahp->ext_ani_state.spurImmunityLevel =
astate->spurImmunityLevel;
ahp->ext_ani_state.firstepLevel =
astate->firstepLevel;
ahp->ext_ani_state.ofdmWeakSigDetectOff =
astate->ofdmWeakSigDetectOff;
ahp->ext_ani_state.cckWeakSigThreshold =
astate->cckWeakSigThreshold;
ahp->ext_ani_state.listenTime =
astate->listenTime;
*result = &ahp->ext_ani_state;
*resultsize = sizeof(ahp->ext_ani_state);
}
return AH_TRUE;
case HAL_DIAG_ANI_CMD:
if (argsize != 2*sizeof(uint32_t))