diff options
| author | adrian <adrian@FreeBSD.org> | 2012-03-22 21:47:14 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2012-03-22 21:47:14 +0000 |
| commit | a791b92eab108062b1a36b8aa52b7b41ac09e427 (patch) | |
| tree | 34d4ffc3af8767eadd47dc55e1cdef7b6e1bef65 /sys/dev | |
| parent | a66a3383e103f6c2b144cf714f2e1f73eaa2991f (diff) | |
| download | FreeBSD-src-a791b92eab108062b1a36b8aa52b7b41ac09e427.zip FreeBSD-src-a791b92eab108062b1a36b8aa52b7b41ac09e427.tar.gz | |
Sprinkle some style(9) things around.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ath/ath_hal/ar5416/ar5416_reset.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c b/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c index 86a3f92..f41bee8 100644 --- a/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c +++ b/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c @@ -689,7 +689,8 @@ ar5416InitUserSettings(struct ath_hal *ah) /* Restore user-specified settings */ if (ahp->ah_miscMode != 0) - OS_REG_WRITE(ah, AR_MISC_MODE, OS_REG_READ(ah, AR_MISC_MODE) | ahp->ah_miscMode); + OS_REG_WRITE(ah, AR_MISC_MODE, OS_REG_READ(ah, AR_MISC_MODE) + | ahp->ah_miscMode); if (ahp->ah_sifstime != (u_int) -1) ar5212SetSifsTime(ah, ahp->ah_sifstime); if (ahp->ah_slottime != (u_int) -1) @@ -1188,7 +1189,8 @@ ar5416SetTransmitPower(struct ath_hal *ah, HAL_RFGAIN ar5416GetRfgain(struct ath_hal *ah) { - return HAL_RFGAIN_INACTIVE; + + return (HAL_RFGAIN_INACTIVE); } /* @@ -1197,13 +1199,14 @@ ar5416GetRfgain(struct ath_hal *ah) HAL_BOOL ar5416Disable(struct ath_hal *ah) { + if (!ar5416SetPowerMode(ah, HAL_PM_AWAKE, AH_TRUE)) return AH_FALSE; if (! ar5416SetResetReg(ah, HAL_RESET_COLD)) return AH_FALSE; AH5416(ah)->ah_initPLL(ah, AH_NULL); - return AH_TRUE; + return (AH_TRUE); } /* @@ -1215,11 +1218,12 @@ ar5416Disable(struct ath_hal *ah) HAL_BOOL ar5416PhyDisable(struct ath_hal *ah) { + if (! ar5416SetResetReg(ah, HAL_RESET_WARM)) return AH_FALSE; AH5416(ah)->ah_initPLL(ah, AH_NULL); - return AH_TRUE; + return (AH_TRUE); } /* @@ -1509,6 +1513,7 @@ ar5416SetDefGainValues(struct ath_hal *ah, const struct ar5416eeprom *eep, uint8_t txRxAttenLocal, int regChainOffset, int i) { + if (IS_EEP_MINOR_V3(ah)) { txRxAttenLocal = pModal->txRxAttenCh[i]; @@ -1705,7 +1710,7 @@ ar5416SetBoardValues(struct ath_hal *ah, const struct ieee80211_channel *chan) eep->baseEepHeader.desiredScaleCCK); } - return AH_TRUE; + return (AH_TRUE); } /* @@ -1739,7 +1744,8 @@ ar5416SetRatesArrayFromTargetPower(struct ath_hal *ah, /* Set rates Array from collected data */ ratesArray[rate6mb] = ratesArray[rate9mb] = ratesArray[rate12mb] = - ratesArray[rate18mb] = ratesArray[rate24mb] = targetPowerOfdm->tPow2x[0]; + ratesArray[rate18mb] = ratesArray[rate24mb] = + targetPowerOfdm->tPow2x[0]; ratesArray[rate36mb] = targetPowerOfdm->tPow2x[1]; ratesArray[rate48mb] = targetPowerOfdm->tPow2x[2]; ratesArray[rate54mb] = targetPowerOfdm->tPow2x[3]; |
