svn commit: r233329 - head/sys/dev/ath/ath_hal/ar5416
Adrian Chadd
adrian at FreeBSD.org
Thu Mar 22 21:47:15 UTC 2012
Author: adrian
Date: Thu Mar 22 21:47:14 2012
New Revision: 233329
URL: http://svn.freebsd.org/changeset/base/233329
Log:
Sprinkle some style(9) things around.
Modified:
head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Thu Mar 22 21:22:58 2012 (r233328)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Thu Mar 22 21:47:14 2012 (r233329)
@@ -689,7 +689,8 @@ ar5416InitUserSettings(struct ath_hal *a
/* 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 *a
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 *a
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,
eep->baseEepHeader.desiredScaleCCK);
}
- return AH_TRUE;
+ return (AH_TRUE);
}
/*
@@ -1739,7 +1744,8 @@ ar5416SetRatesArrayFromTargetPower(struc
/* 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];
More information about the svn-src-head
mailing list