summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradrian <adrian@FreeBSD.org>2011-04-22 17:57:13 +0000
committeradrian <adrian@FreeBSD.org>2011-04-22 17:57:13 +0000
commit44325abfea7570a22af7a54f3a32c64fa462744f (patch)
treee71de1e981e74a12d2244ddcfa08d98cac79506d
parenta86fde8935c4795d5afeb499b43326807412077c (diff)
downloadFreeBSD-src-44325abfea7570a22af7a54f3a32c64fa462744f.zip
FreeBSD-src-44325abfea7570a22af7a54f3a32c64fa462744f.tar.gz
Fix the merlin LNA configuration code - these are bit flags, not raw values to be
written into the registers.
-rw-r--r--sys/dev/ath/ath_hal/ar5416/ar5416_reset.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c b/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
index 011ee3d..d8da552 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
@@ -1434,8 +1434,10 @@ ar5416SetBoardValues(struct ath_hal *ah, const struct ieee80211_channel *chan)
OS_A_REG_RMW_FIELD(ah, AR_AN_RF5G1_CH1, AR_AN_RF5G1_CH1_DB5, pModal->db_ch1);
}
OS_A_REG_RMW_FIELD(ah, AR_AN_TOP2, AR_AN_TOP2_XPABIAS_LVL, pModal->xpaBiasLvl);
- OS_A_REG_RMW_FIELD(ah, AR_AN_TOP2, AR_AN_TOP2_LOCALBIAS, pModal->flagBits & AR5416_EEP_FLAG_LOCALBIAS);
- OS_A_REG_RMW_FIELD(ah, AR_PHY_XPA_CFG, AR_PHY_FORCE_XPA_CFG, pModal->flagBits & AR5416_EEP_FLAG_FORCEXPAON);
+ OS_A_REG_RMW_FIELD(ah, AR_AN_TOP2, AR_AN_TOP2_LOCALBIAS,
+ !!(pModal->flagBits & AR5416_EEP_FLAG_LOCALBIAS));
+ OS_A_REG_RMW_FIELD(ah, AR_PHY_XPA_CFG, AR_PHY_FORCE_XPA_CFG,
+ !!(pModal->flagBits & AR5416_EEP_FLAG_FORCEXPAON));
}
OS_REG_RMW_FIELD(ah, AR_PHY_SETTLING, AR_PHY_SETTLING_SWITCH, pModal->switchSettling);
OpenPOWER on IntegriCloud