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

staging: rtl8723au: Clean up odm_RSSIMonitorCheck()

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 2015-03-02 15:24:59 -05:00 committed by Greg Kroah-Hartman
parent 1a5767e882
commit 04b7466fa5
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,7 +191,7 @@ void odm_DynamicBBPowerSaving23a(struct dm_odm_t *pDM_Odm);
void odm_DynamicTxPower23aInit(struct dm_odm_t *pDM_Odm); void odm_DynamicTxPower23aInit(struct dm_odm_t *pDM_Odm);
void odm_RSSIMonitorCheck23a(struct dm_odm_t *pDM_Odm); static void odm_RSSIMonitorCheck(struct dm_odm_t *pDM_Odm);
void odm_DynamicTxPower23a(struct dm_odm_t *pDM_Odm); void odm_DynamicTxPower23a(struct dm_odm_t *pDM_Odm);
void odm_RefreshRateAdaptiveMask23a(struct dm_odm_t *pDM_Odm); void odm_RefreshRateAdaptiveMask23a(struct dm_odm_t *pDM_Odm);
@ -251,7 +251,7 @@ void ODM_DMWatchdog23a(struct rtw_adapter *adapter)
odm_CmnInfoUpdate_Debug23a(pDM_Odm); odm_CmnInfoUpdate_Debug23a(pDM_Odm);
odm_CommonInfoSelfUpdate(pHalData); odm_CommonInfoSelfUpdate(pHalData);
odm_FalseAlarmCounterStatistics23a(pDM_Odm); odm_FalseAlarmCounterStatistics23a(pDM_Odm);
odm_RSSIMonitorCheck23a(pDM_Odm); odm_RSSIMonitorCheck(pDM_Odm);
/* 8723A or 8189ES platform */ /* 8723A or 8189ES platform */
/* NeilChen--2012--08--24-- */ /* NeilChen--2012--08--24-- */
@ -1170,14 +1170,15 @@ FindMinimumRSSI(
pdmpriv->MinUndecoratedPWDBForDM = pdmpriv->EntryMinUndecoratedSmoothedPWDB; pdmpriv->MinUndecoratedPWDBForDM = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
} }
void odm_RSSIMonitorCheck23a(struct dm_odm_t *pDM_Odm) static void odm_RSSIMonitorCheck(struct dm_odm_t *pDM_Odm)
{ {
struct rtw_adapter *Adapter = pDM_Odm->Adapter; struct rtw_adapter *Adapter = pDM_Odm->Adapter;
struct hal_data_8723a *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8723a *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
int i; int i;
int tmpEntryMaxPWDB = 0, tmpEntryMinPWDB = 0xff; int MaxDB = 0, MinDB = 0xff;
u8 sta_cnt = 0; u8 sta_cnt = 0;
u32 tmpdb;
u32 PWDB_rssi[NUM_STA] = {0};/* 0~15]:MACID, [16~31]:PWDB_rssi */ u32 PWDB_rssi[NUM_STA] = {0};/* 0~15]:MACID, [16~31]:PWDB_rssi */
struct sta_info *psta; struct sta_info *psta;
@ -1187,36 +1188,36 @@ void odm_RSSIMonitorCheck23a(struct dm_odm_t *pDM_Odm)
for (i = 0; i < ODM_ASSOCIATE_ENTRY_NUM; i++) { for (i = 0; i < ODM_ASSOCIATE_ENTRY_NUM; i++) {
psta = pDM_Odm->pODM_StaInfo[i]; psta = pDM_Odm->pODM_StaInfo[i];
if (psta) { if (psta) {
if (psta->rssi_stat.UndecoratedSmoothedPWDB < tmpEntryMinPWDB) if (psta->rssi_stat.UndecoratedSmoothedPWDB < MinDB)
tmpEntryMinPWDB = psta->rssi_stat.UndecoratedSmoothedPWDB; MinDB = psta->rssi_stat.UndecoratedSmoothedPWDB;
if (psta->rssi_stat.UndecoratedSmoothedPWDB > tmpEntryMaxPWDB) if (psta->rssi_stat.UndecoratedSmoothedPWDB > MaxDB)
tmpEntryMaxPWDB = psta->rssi_stat.UndecoratedSmoothedPWDB; MaxDB = psta->rssi_stat.UndecoratedSmoothedPWDB;
if (psta->rssi_stat.UndecoratedSmoothedPWDB != (-1)) if (psta->rssi_stat.UndecoratedSmoothedPWDB != -1) {
PWDB_rssi[sta_cnt++] = (psta->mac_id | (psta->rssi_stat.UndecoratedSmoothedPWDB<<16)); tmpdb = psta->rssi_stat.UndecoratedSmoothedPWDB;
PWDB_rssi[sta_cnt++] = psta->mac_id |
(tmpdb << 16);
}
} }
} }
for (i = 0; i < sta_cnt; i++) { for (i = 0; i < sta_cnt; i++) {
if (PWDB_rssi[i] != (0)) { if (PWDB_rssi[i] != (0))
rtl8723a_set_rssi_cmd(Adapter, (u8 *)&PWDB_rssi[i]); rtl8723a_set_rssi_cmd(Adapter, (u8 *)&PWDB_rssi[i]);
} }
}
if (tmpEntryMaxPWDB != 0) /* If associated entry is found */ pdmpriv->EntryMaxUndecoratedSmoothedPWDB = MaxDB;
pdmpriv->EntryMaxUndecoratedSmoothedPWDB = tmpEntryMaxPWDB;
else
pdmpriv->EntryMaxUndecoratedSmoothedPWDB = 0;
if (tmpEntryMinPWDB != 0xff) /* If associated entry is found */ if (MinDB != 0xff) /* If associated entry is found */
pdmpriv->EntryMinUndecoratedSmoothedPWDB = tmpEntryMinPWDB; pdmpriv->EntryMinUndecoratedSmoothedPWDB = MinDB;
else else
pdmpriv->EntryMinUndecoratedSmoothedPWDB = 0; pdmpriv->EntryMinUndecoratedSmoothedPWDB = 0;
FindMinimumRSSI(Adapter);/* get pdmpriv->MinUndecoratedPWDBForDM */ FindMinimumRSSI(Adapter);/* get pdmpriv->MinUndecoratedPWDBForDM */
ODM_CmnInfoUpdate23a(&pHalData->odmpriv, ODM_CMNINFO_RSSI_MIN, pdmpriv->MinUndecoratedPWDBForDM); ODM_CmnInfoUpdate23a(&pHalData->odmpriv, ODM_CMNINFO_RSSI_MIN,
pdmpriv->MinUndecoratedPWDBForDM);
} }
/* endif */ /* endif */