svn commit: r220955 - head/sys/dev/ath/ath_hal/ar5416

[Adrian Chadd]

Author: adrian
Date: Fri Apr 22 17:57:13 2011
New Revision: 220955
URL: http://svn.freebsd.org/changeset/base/220955

Log:
  Fix the merlin LNA configuration code - these are bit flags, not raw values to be
  written into the registers.

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	Fri Apr 22 17:10:51 2011	(r220954)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c	Fri Apr 22 17:57:13 2011	(r220955)
@@ -1434,8 +1434,10 @@ ar5416SetBoardValues(struct ath_hal *ah,
                         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);