rtl8188eu: Remove CONFIG_ODM_REFRESH_RAMASK

This parameter is always defined.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-02-24 09:43:25 -06:00
parent 8e700a6ee2
commit a76a620b5f
4 changed files with 3 additions and 18 deletions

View file

@ -212,7 +212,6 @@ void rtl8188e_Add_RateATid(struct adapter *pAdapter, u32 bitmap, u8 arg, u8 rssi
macid = arg&0x1f; macid = arg&0x1f;
#ifdef CONFIG_ODM_REFRESH_RAMASK
raid = (bitmap>>28) & 0x0f; raid = (bitmap>>28) & 0x0f;
bitmap &=0x0fffffff; bitmap &=0x0fffffff;
@ -220,8 +219,6 @@ void rtl8188e_Add_RateATid(struct adapter *pAdapter, u32 bitmap, u8 arg, u8 rssi
bitmap = ODM_Get_Rate_Bitmap(&pHalData->odmpriv, macid, bitmap, rssi_level); bitmap = ODM_Get_Rate_Bitmap(&pHalData->odmpriv, macid, bitmap, rssi_level);
bitmap |= ((raid<<28)&0xf0000000); bitmap |= ((raid<<28)&0xf0000000);
#endif /* CONFIG_ODM_REFRESH_RAMASK */
init_rate = get_highest_rate_idx(bitmap&0x0fffffff)&0x3f; init_rate = get_highest_rate_idx(bitmap&0x0fffffff)&0x3f;
@ -230,9 +227,6 @@ void rtl8188e_Add_RateATid(struct adapter *pAdapter, u32 bitmap, u8 arg, u8 rssi
if (shortGIrate==true) if (shortGIrate==true)
init_rate |= BIT(6); init_rate |= BIT(6);
/* rtw_write8(pAdapter, (REG_INIDATA_RATE_SEL+macid), (u8)init_rate); */
raid = (bitmap>>28) & 0x0f; raid = (bitmap>>28) & 0x0f;
bitmap &= 0x0fffffff; bitmap &= 0x0fffffff;

View file

@ -209,9 +209,7 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapter)
pdmpriv->InitODMFlag = 0 pdmpriv->InitODMFlag = 0
| ODM_BB_DIG | ODM_BB_DIG
#ifdef CONFIG_ODM_REFRESH_RAMASK
| ODM_BB_RA_MASK | ODM_BB_RA_MASK
#endif
| ODM_BB_DYNAMIC_TXPWR | ODM_BB_DYNAMIC_TXPWR
| ODM_BB_FA_CNT | ODM_BB_FA_CNT
| ODM_BB_RSSI_MONITOR | ODM_BB_RSSI_MONITOR

View file

@ -3675,15 +3675,9 @@ static void UpdateHalRAMask8188EUsb(struct adapter *padapter, u32 mac_id, u8 rss
break; break;
} }
/* mask &=0x0fffffff; */
rate_bitmap = 0x0fffffff;
#ifdef CONFIG_ODM_REFRESH_RAMASK
{
rate_bitmap = ODM_Get_Rate_Bitmap(&pHalData->odmpriv,mac_id,mask,rssi_level); rate_bitmap = ODM_Get_Rate_Bitmap(&pHalData->odmpriv,mac_id,mask,rssi_level);
printk("%s => mac_id:%d, networkType:0x%02x, mask:0x%08x\n\t ==> rssi_level:%d, rate_bitmap:0x%08x\n", pr_info("%s => mac_id:%d, networkType:0x%02x, mask:0x%08x\n\t ==> rssi_level:%d, rate_bitmap:0x%08x\n",
__FUNCTION__,mac_id,networkType,mask,rssi_level,rate_bitmap); __FUNCTION__,mac_id,networkType,mask,rssi_level,rate_bitmap);
}
#endif
mask &= rate_bitmap; mask &= rate_bitmap;

View file

@ -19,7 +19,6 @@
******************************************************************************/ ******************************************************************************/
//***** temporarily flag ******* //***** temporarily flag *******
#define CONFIG_ODM_REFRESH_RAMASK
#define CONFIG_PHY_SETTING_WITH_ODM #define CONFIG_PHY_SETTING_WITH_ODM
//for FPGA VERIFICATION config //for FPGA VERIFICATION config
#define RTL8188E_FPGAtrue_PHY_VERIFICATION 0 #define RTL8188E_FPGAtrue_PHY_VERIFICATION 0