leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: rtl8723au: Eliminate ODM_CMNINFO_BW usage

Browse Source 
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2014-07-21 11:24:57 +02:00 committed by Greg Kroah-Hartman
parent 91a2916a82
commit 301fc630ef
5 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/staging/rtl8723au/hal/odm.c
View File

@ -417,9 +417,6 @@ void ODM23a_CmnInfoHook(struct dm_odm_t *pDM_Odm,
/* Hook call by reference pointer. */ /* Hook call by reference pointer. */
switch (CmnInfo) { switch (CmnInfo) {
/* Dynamic call by reference pointer. */ /* Dynamic call by reference pointer. */
case ODM_CMNINFO_BW:
pDM_Odm->pBandWidth = (u8 *)pValue;
break;
case ODM_CMNINFO_CHNL: case ODM_CMNINFO_CHNL:
pDM_Odm->pChannel = (u8 *)pValue; pDM_Odm->pChannel = (u8 *)pValue;
break; break;
@ -506,7 +503,7 @@ static void odm_CommonInfoSelfUpdate(struct hal_data_8723a *pHalData)
u8 EntryCnt = 0; u8 EntryCnt = 0;
u8 i; u8 i;
if (*(pDM_Odm->pBandWidth) == ODM_BW40M) { if (pHalData->CurrentChannelBW == HT_CHANNEL_WIDTH_40) {
if (pHalData->nCur40MhzPrimeSC == 1) if (pHalData->nCur40MhzPrimeSC == 1)
pDM_Odm->ControlChannel = *(pDM_Odm->pChannel) - 2; pDM_Odm->ControlChannel = *(pDM_Odm->pChannel) - 2;
else if (pHalData->nCur40MhzPrimeSC == 2) else if (pHalData->nCur40MhzPrimeSC == 2)
@ -549,7 +546,6 @@ void odm_CmnInfoInit_Debug23a(struct dm_odm_t *pDM_Odm)
void odm_CmnInfoHook_Debug23a(struct dm_odm_t *pDM_Odm) void odm_CmnInfoHook_Debug23a(struct dm_odm_t *pDM_Odm)
{ {
ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("odm_CmnInfoHook_Debug23a ==>\n")); ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("odm_CmnInfoHook_Debug23a ==>\n"));
ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pBandWidth =%d\n", *(pDM_Odm->pBandWidth)));
ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pChannel =%d\n", *(pDM_Odm->pChannel))); ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pChannel =%d\n", *(pDM_Odm->pChannel)));
ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pbScanInProcess =%d\n", *(pDM_Odm->pbScanInProcess))); ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pbScanInProcess =%d\n", *(pDM_Odm->pbScanInProcess)));
@ -1137,11 +1133,10 @@ void odm_RateAdaptiveMaskInit23a(struct dm_odm_t *pDM_Odm)
pOdmRA->LowRSSIThresh = 20; pOdmRA->LowRSSIThresh = 20;
} }
u32 ODM_Get_Rate_Bitmap23a(struct dm_odm_t *pDM_Odm, u32 ODM_Get_Rate_Bitmap23a(struct hal_data_8723a *pHalData, u32 macid,
u32 macid, u32 ra_mask, u8 rssi_level)
u32 ra_mask,
u8 rssi_level)
{ {
struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
struct sta_info *pEntry; struct sta_info *pEntry;
u32 rate_bitmap = 0x0fffffff; u32 rate_bitmap = 0x0fffffff;
u8 WirelessMode; u8 WirelessMode;
@ -1181,7 +1176,8 @@ u32 ODM_Get_Rate_Bitmap23a(struct dm_odm_t *pDM_Odm,
} else if (rssi_level == DM_RATR_STA_MIDDLE) { } else if (rssi_level == DM_RATR_STA_MIDDLE) {
rate_bitmap = 0x000ff000; rate_bitmap = 0x000ff000;
} else { } else {
if (*(pDM_Odm->pBandWidth) == ODM_BW40M) if (pHalData->CurrentChannelBW ==
HT_CHANNEL_WIDTH_40)
rate_bitmap = 0x000ff015; rate_bitmap = 0x000ff015;
else else
rate_bitmap = 0x000ff005; rate_bitmap = 0x000ff005;
@ -1192,7 +1188,8 @@ u32 ODM_Get_Rate_Bitmap23a(struct dm_odm_t *pDM_Odm,
} else if (rssi_level == DM_RATR_STA_MIDDLE) { } else if (rssi_level == DM_RATR_STA_MIDDLE) {
rate_bitmap = 0x0f8ff000; rate_bitmap = 0x0f8ff000;
} else { } else {
if (*(pDM_Odm->pBandWidth) == ODM_BW40M) if (pHalData->CurrentChannelBW ==
HT_CHANNEL_WIDTH_40)
rate_bitmap = 0x0f8ff015; rate_bitmap = 0x0f8ff015;
else else
rate_bitmap = 0x0f8ff005; rate_bitmap = 0x0f8ff005;

3
drivers/staging/rtl8723au/hal/rtl8723a_cmd.c
View File

@ -151,7 +151,8 @@ void rtl8723a_add_rateatid(struct rtw_adapter *pAdapter, u32 bitmap, u8 arg, u8
bitmap &= 0x0fffffff; bitmap &= 0x0fffffff;
if (rssi_level != DM_RATR_STA_INIT) if (rssi_level != DM_RATR_STA_INIT)
bitmap = ODM_Get_Rate_Bitmap23a(&pHalData->odmpriv, macid, bitmap, rssi_level); bitmap = ODM_Get_Rate_Bitmap23a(pHalData, macid, bitmap,
rssi_level);
bitmap |= ((raid<<28)&0xf0000000); bitmap |= ((raid<<28)&0xf0000000);

2
drivers/staging/rtl8723au/hal/rtl8723a_dm.c
View File

@ -152,8 +152,6 @@ static void Update_ODM_ComInfo_8723a(struct rtw_adapter *Adapter)
/* Pointer reference */ /* Pointer reference */
rtl8723a_odm_support_ability_set(Adapter, DYNAMIC_ALL_FUNC_ENABLE); rtl8723a_odm_support_ability_set(Adapter, DYNAMIC_ALL_FUNC_ENABLE);
ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_BW,
&pHalData->CurrentChannelBW);
ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_CHNL, ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_CHNL,
&pHalData->CurrentChannel); &pHalData->CurrentChannel);
ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_SCAN, &pmlmepriv->bScanInProcess); ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_SCAN, &pmlmepriv->bScanInProcess);

4
drivers/staging/rtl8723au/hal/usb_halinit.c
View File

@ -1500,8 +1500,8 @@ void rtl8723a_update_ramask(struct rtw_adapter *padapter,
/* mask &= 0x0fffffff; */ /* mask &= 0x0fffffff; */
rate_bitmap = 0x0fffffff; rate_bitmap = 0x0fffffff;
rate_bitmap = ODM_Get_Rate_Bitmap23a(&pHalData->odmpriv, rate_bitmap = ODM_Get_Rate_Bitmap23a(pHalData, mac_id, mask,
mac_id, mask, rssi_level); rssi_level);
DBG_8723A("%s => mac_id:%d, networkType:0x%02x, " DBG_8723A("%s => mac_id:%d, networkType:0x%02x, "
"mask:0x%08x\n\t ==> rssi_level:%d, rate_bitmap:0x%08x\n", "mask:0x%08x\n\t ==> rssi_level:%d, rate_bitmap:0x%08x\n",
__func__, mac_id, networkType, mask, rssi_level, rate_bitmap); __func__, mac_id, networkType, mask, rssi_level, rate_bitmap);

17
drivers/staging/rtl8723au/include/odm.h
View File

@ -319,7 +319,6 @@ enum odm_cmninfo {
/* */ /* */
/* Dynamic value: */ /* Dynamic value: */
/* */ /* */
ODM_CMNINFO_BW, /* enum odm_band_width */
ODM_CMNINFO_CHNL, ODM_CMNINFO_CHNL,
ODM_CMNINFO_SCAN, ODM_CMNINFO_SCAN,
@ -495,15 +494,6 @@ enum odm_sec_chnl_offset {
ODM_ABOVE = 2 ODM_ABOVE = 2
}; };
/* ODM_CMNINFO_BW */
enum odm_band_width {
ODM_BW20M = 0,
ODM_BW40M = 1,
ODM_BW80M = 2,
ODM_BW160M = 3,
ODM_BW10M = 4,
};
/* ODM_CMNINFO_CHNL */ /* ODM_CMNINFO_CHNL */
/* ODM_CMNINFO_BOARD_TYPE */ /* ODM_CMNINFO_BOARD_TYPE */
@ -696,8 +686,6 @@ struct dm_odm_t {
bool bool_temp; bool bool_temp;
struct rtw_adapter *PADAPTER_temp; struct rtw_adapter *PADAPTER_temp;
/* BW info 20M/40M/80M = 0/1/2 */
u8 *pBandWidth;
/* Central channel location Ch1/Ch2/.... */ /* Central channel location Ch1/Ch2/.... */
u8 *pChannel; /* central channel number */ u8 *pChannel; /* central channel number */
/* Common info for Status */ /* Common info for Status */
@ -962,6 +950,8 @@ extern u8 CCKSwingTable_Ch1423A [CCK_TABLE_SIZE][8];
#define SWAW_STEP_PEAK 0 #define SWAW_STEP_PEAK 0
#define SWAW_STEP_DETERMINE 1 #define SWAW_STEP_DETERMINE 1
struct hal_data_8723a;
void ODM_Write_DIG23a(struct dm_odm_t *pDM_Odm, u8 CurrentIGI); void ODM_Write_DIG23a(struct dm_odm_t *pDM_Odm, u8 CurrentIGI);
void ODM_Write_CCK_CCA_Thres23a(struct dm_odm_t *pDM_Odm, u8 CurCCK_CCAThres); void ODM_Write_CCK_CCA_Thres23a(struct dm_odm_t *pDM_Odm, u8 CurCCK_CCAThres);
@ -991,12 +981,11 @@ u32 GetPSDData(struct dm_odm_t *pDM_Odm, unsigned int point, u8 initial_gain_psd
void odm_DIG23abyRSSI_LPS(struct dm_odm_t *pDM_Odm); void odm_DIG23abyRSSI_LPS(struct dm_odm_t *pDM_Odm);
u32 ODM_Get_Rate_Bitmap23a(struct dm_odm_t *pDM_Odm, u32 macid, u32 ra_mask, u8 rssi_level); u32 ODM_Get_Rate_Bitmap23a(struct hal_data_8723a *pHalData, u32 macid, u32 ra_mask, u8 rssi_level);
void ODM23a_DMInit(struct dm_odm_t *pDM_Odm); void ODM23a_DMInit(struct dm_odm_t *pDM_Odm);
struct hal_data_8723a;
void ODM_DMWatchdog23a(struct hal_data_8723a *pHalData); void ODM_DMWatchdog23a(struct hal_data_8723a *pHalData);
void ODM_CmnInfoInit23a(struct dm_odm_t *pDM_Odm, enum odm_cmninfo CmnInfo, u32 Value); void ODM_CmnInfoInit23a(struct dm_odm_t *pDM_Odm, enum odm_cmninfo CmnInfo, u32 Value);