|
@@ -598,8 +598,8 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
|
|
|
RT_TRACE(COMP_POWER_TRACKING, "tx power track is done\n");
|
|
|
RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpowertrackingindex = %d\n", priv->rfa_txpowertrackingindex);
|
|
|
RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpowertrackingindex_real = %d\n", priv->rfa_txpowertrackingindex_real);
|
|
|
- RT_TRACE(COMP_POWER_TRACKING, "priv->cck_present_attentuation_difference = %d\n", priv->cck_present_attentuation_difference);
|
|
|
- RT_TRACE(COMP_POWER_TRACKING, "priv->cck_present_attentuation = %d\n", priv->cck_present_attentuation);
|
|
|
+ RT_TRACE(COMP_POWER_TRACKING, "priv->cck_present_attenuation_difference = %d\n", priv->cck_present_attenuation_difference);
|
|
|
+ RT_TRACE(COMP_POWER_TRACKING, "priv->cck_present_attenuation = %d\n", priv->cck_present_attenuation);
|
|
|
return;
|
|
|
}
|
|
|
if (Avg_TSSI_Meas_from_driver < TSSI_13dBm - E_FOR_TX_POWER_TRACK) {
|
|
@@ -618,17 +618,17 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
|
|
|
|
|
|
}
|
|
|
}
|
|
|
- priv->cck_present_attentuation_difference
|
|
|
+ priv->cck_present_attenuation_difference
|
|
|
= priv->rfa_txpowertrackingindex - priv->rfa_txpowertracking_default;
|
|
|
|
|
|
if (priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20)
|
|
|
- priv->cck_present_attentuation
|
|
|
- = priv->cck_present_attentuation_20Mdefault + priv->cck_present_attentuation_difference;
|
|
|
+ priv->cck_present_attenuation
|
|
|
+ = priv->cck_present_attenuation_20Mdefault + priv->cck_present_attenuation_difference;
|
|
|
else
|
|
|
- priv->cck_present_attentuation
|
|
|
- = priv->cck_present_attentuation_40Mdefault + priv->cck_present_attentuation_difference;
|
|
|
+ priv->cck_present_attenuation
|
|
|
+ = priv->cck_present_attenuation_40Mdefault + priv->cck_present_attenuation_difference;
|
|
|
|
|
|
- if (priv->cck_present_attentuation > -1 && priv->cck_present_attentuation < 23) {
|
|
|
+ if (priv->cck_present_attenuation > -1 && priv->cck_present_attenuation < 23) {
|
|
|
if (priv->ieee80211->current_network.channel == 14 && !priv->bcck_in_ch14) {
|
|
|
priv->bcck_in_ch14 = true;
|
|
|
dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
|
|
@@ -640,10 +640,10 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
|
|
|
}
|
|
|
RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpowertrackingindex = %d\n", priv->rfa_txpowertrackingindex);
|
|
|
RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpowertrackingindex_real = %d\n", priv->rfa_txpowertrackingindex_real);
|
|
|
- RT_TRACE(COMP_POWER_TRACKING, "priv->cck_present_attentuation_difference = %d\n", priv->cck_present_attentuation_difference);
|
|
|
- RT_TRACE(COMP_POWER_TRACKING, "priv->cck_present_attentuation = %d\n", priv->cck_present_attentuation);
|
|
|
+ RT_TRACE(COMP_POWER_TRACKING, "priv->cck_present_attenuation_difference = %d\n", priv->cck_present_attenuation_difference);
|
|
|
+ RT_TRACE(COMP_POWER_TRACKING, "priv->cck_present_attenuation = %d\n", priv->cck_present_attenuation);
|
|
|
|
|
|
- if (priv->cck_present_attentuation_difference <= -12 || priv->cck_present_attentuation_difference >= 24) {
|
|
|
+ if (priv->cck_present_attenuation_difference <= -12 || priv->cck_present_attenuation_difference >= 24) {
|
|
|
priv->ieee80211->bdynamic_txpower_enable = true;
|
|
|
write_nic_byte(dev, 0x1ba, 0);
|
|
|
RT_TRACE(COMP_POWER_TRACKING, "tx power track--->limited\n");
|
|
@@ -1384,35 +1384,35 @@ static void dm_CCKTxPowerAdjust_TSSI(struct net_device *dev, bool bInCH14)
|
|
|
TempVal = 0;
|
|
|
if (!bInCH14) {
|
|
|
/* Write 0xa22 0xa23 */
|
|
|
- TempVal = priv->cck_txbbgain_table[priv->cck_present_attentuation].ccktxbb_valuearray[0] +
|
|
|
- (priv->cck_txbbgain_table[priv->cck_present_attentuation].ccktxbb_valuearray[1]<<8);
|
|
|
+ TempVal = priv->cck_txbbgain_table[priv->cck_present_attenuation].ccktxbb_valuearray[0] +
|
|
|
+ (priv->cck_txbbgain_table[priv->cck_present_attenuation].ccktxbb_valuearray[1]<<8);
|
|
|
|
|
|
rtl8192_setBBreg(dev, rCCK0_TxFilter1, bMaskHWord, TempVal);
|
|
|
/* Write 0xa24 ~ 0xa27 */
|
|
|
- TempVal = priv->cck_txbbgain_table[priv->cck_present_attentuation].ccktxbb_valuearray[2] +
|
|
|
- (priv->cck_txbbgain_table[priv->cck_present_attentuation].ccktxbb_valuearray[3]<<8) +
|
|
|
- (priv->cck_txbbgain_table[priv->cck_present_attentuation].ccktxbb_valuearray[4]<<16)+
|
|
|
- (priv->cck_txbbgain_table[priv->cck_present_attentuation].ccktxbb_valuearray[5]<<24);
|
|
|
+ TempVal = priv->cck_txbbgain_table[priv->cck_present_attenuation].ccktxbb_valuearray[2] +
|
|
|
+ (priv->cck_txbbgain_table[priv->cck_present_attenuation].ccktxbb_valuearray[3]<<8) +
|
|
|
+ (priv->cck_txbbgain_table[priv->cck_present_attenuation].ccktxbb_valuearray[4]<<16)+
|
|
|
+ (priv->cck_txbbgain_table[priv->cck_present_attenuation].ccktxbb_valuearray[5]<<24);
|
|
|
rtl8192_setBBreg(dev, rCCK0_TxFilter2, bMaskDWord, TempVal);
|
|
|
/* Write 0xa28 0xa29 */
|
|
|
- TempVal = priv->cck_txbbgain_table[priv->cck_present_attentuation].ccktxbb_valuearray[6] +
|
|
|
- (priv->cck_txbbgain_table[priv->cck_present_attentuation].ccktxbb_valuearray[7]<<8);
|
|
|
+ TempVal = priv->cck_txbbgain_table[priv->cck_present_attenuation].ccktxbb_valuearray[6] +
|
|
|
+ (priv->cck_txbbgain_table[priv->cck_present_attenuation].ccktxbb_valuearray[7]<<8);
|
|
|
|
|
|
rtl8192_setBBreg(dev, rCCK0_DebugPort, bMaskLWord, TempVal);
|
|
|
} else {
|
|
|
- TempVal = priv->cck_txbbgain_ch14_table[priv->cck_present_attentuation].ccktxbb_valuearray[0] +
|
|
|
- (priv->cck_txbbgain_ch14_table[priv->cck_present_attentuation].ccktxbb_valuearray[1]<<8);
|
|
|
+ TempVal = priv->cck_txbbgain_ch14_table[priv->cck_present_attenuation].ccktxbb_valuearray[0] +
|
|
|
+ (priv->cck_txbbgain_ch14_table[priv->cck_present_attenuation].ccktxbb_valuearray[1]<<8);
|
|
|
|
|
|
rtl8192_setBBreg(dev, rCCK0_TxFilter1, bMaskHWord, TempVal);
|
|
|
/* Write 0xa24 ~ 0xa27 */
|
|
|
- TempVal = priv->cck_txbbgain_ch14_table[priv->cck_present_attentuation].ccktxbb_valuearray[2] +
|
|
|
- (priv->cck_txbbgain_ch14_table[priv->cck_present_attentuation].ccktxbb_valuearray[3]<<8) +
|
|
|
- (priv->cck_txbbgain_ch14_table[priv->cck_present_attentuation].ccktxbb_valuearray[4]<<16)+
|
|
|
- (priv->cck_txbbgain_ch14_table[priv->cck_present_attentuation].ccktxbb_valuearray[5]<<24);
|
|
|
+ TempVal = priv->cck_txbbgain_ch14_table[priv->cck_present_attenuation].ccktxbb_valuearray[2] +
|
|
|
+ (priv->cck_txbbgain_ch14_table[priv->cck_present_attenuation].ccktxbb_valuearray[3]<<8) +
|
|
|
+ (priv->cck_txbbgain_ch14_table[priv->cck_present_attenuation].ccktxbb_valuearray[4]<<16)+
|
|
|
+ (priv->cck_txbbgain_ch14_table[priv->cck_present_attenuation].ccktxbb_valuearray[5]<<24);
|
|
|
rtl8192_setBBreg(dev, rCCK0_TxFilter2, bMaskDWord, TempVal);
|
|
|
/* Write 0xa28 0xa29 */
|
|
|
- TempVal = priv->cck_txbbgain_ch14_table[priv->cck_present_attentuation].ccktxbb_valuearray[6] +
|
|
|
- (priv->cck_txbbgain_ch14_table[priv->cck_present_attentuation].ccktxbb_valuearray[7]<<8);
|
|
|
+ TempVal = priv->cck_txbbgain_ch14_table[priv->cck_present_attenuation].ccktxbb_valuearray[6] +
|
|
|
+ (priv->cck_txbbgain_ch14_table[priv->cck_present_attenuation].ccktxbb_valuearray[7]<<8);
|
|
|
|
|
|
rtl8192_setBBreg(dev, rCCK0_DebugPort, bMaskLWord, TempVal);
|
|
|
}
|
|
@@ -1495,7 +1495,7 @@ static void dm_txpower_reset_recovery(
|
|
|
RT_TRACE(COMP_POWER_TRACKING, "Reset Recovery: Fill in 0xc80 is %08x\n", priv->txbbgain_table[priv->rfa_txpowertrackingindex].txbbgain_value);
|
|
|
RT_TRACE(COMP_POWER_TRACKING, "Reset Recovery: Fill in RFA_txPowerTrackingIndex is %x\n", priv->rfa_txpowertrackingindex);
|
|
|
RT_TRACE(COMP_POWER_TRACKING, "Reset Recovery : RF A I/Q Amplify Gain is %ld\n", priv->txbbgain_table[priv->rfa_txpowertrackingindex].txbb_iq_amplifygain);
|
|
|
- RT_TRACE(COMP_POWER_TRACKING, "Reset Recovery: CCK Attenuation is %d dB\n", priv->cck_present_attentuation);
|
|
|
+ RT_TRACE(COMP_POWER_TRACKING, "Reset Recovery: CCK Attenuation is %d dB\n", priv->cck_present_attenuation);
|
|
|
dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
|
|
|
|
|
|
rtl8192_setBBreg(dev, rOFDM0_XCTxIQImbalance, bMaskDWord, priv->txbbgain_table[priv->rfc_txpowertrackingindex].txbbgain_value);
|