UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: rtl8723au: odm.c: Rename BTDM_DisableEDCATurbo() to rtl8723a_BT_disable_EDCA_turbo() 

Make it return bool since it only returns true/false, and get rid of

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-05-25 22:43:37 +02:00 committed by Greg Kroah-Hartman
parent d0fc14642f
commit dddeff3f20
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1668,10 +1668,8 @@ void odm_EdcaTurboCheck23aCE23a(struct dm_odm_t *pDM_Odm)
if (pmlmeinfo->assoc_AP_vendor >= HT_IOT_PEER_MAX) if (pmlmeinfo->assoc_AP_vendor >= HT_IOT_PEER_MAX)
goto dm_CheckEdcaTurbo_EXIT; goto dm_CheckEdcaTurbo_EXIT;
#ifdef CONFIG_8723AU_BT_COEXIST if (rtl8723a_BT_disable_EDCA_turbo(Adapter))
if (BT_DisableEDCATurbo(Adapter))
goto dm_CheckEdcaTurbo_EXIT; goto dm_CheckEdcaTurbo_EXIT;
#endif
/* Check if the status needs to be changed. */ /* Check if the status needs to be changed. */
if ((bbtchange) || (!precvpriv->bIsAnyNonBEPkts)) { if ((bbtchange) || (!precvpriv->bIsAnyNonBEPkts)) {

4
drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
View File

@ -10534,13 +10534,13 @@ u8 BTDM_CheckCoexRSSIState(struct rtw_adapter *padapter, u8 levelNum,
return btRssiState; return btRssiState;
} }
u8 BTDM_DisableEDCATurbo(struct rtw_adapter *padapter) bool rtl8723a_BT_disable_EDCA_turbo(struct rtw_adapter *padapter)
{ {
struct bt_mgnt *pBtMgnt; struct bt_mgnt *pBtMgnt;
struct hal_data_8723a *pHalData; struct hal_data_8723a *pHalData;
u8 bBtChangeEDCA = false; u8 bBtChangeEDCA = false;
u32 EDCA_BT_BE = 0x5ea42b, cur_EDCA_reg; u32 EDCA_BT_BE = 0x5ea42b, cur_EDCA_reg;
u8 bRet = false; bool bRet = false;
pHalData = GET_HAL_DATA(padapter); pHalData = GET_HAL_DATA(padapter);
pBtMgnt = &pHalData->BtInfo.BtMgnt; pBtMgnt = &pHalData->BtInfo.BtMgnt;

2
drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h
View File

@ -1557,8 +1557,6 @@ s32 BTDM_GetRxSS(struct rtw_adapter * padapter);
u8 BTDM_CheckCoexBcnRssiState(struct rtw_adapter * padapter, u8 levelNum, u8 RssiThresh, u8 RssiThresh1); u8 BTDM_CheckCoexBcnRssiState(struct rtw_adapter * padapter, u8 levelNum, u8 RssiThresh, u8 RssiThresh1);
u8 BTDM_CheckCoexRSSIState1(struct rtw_adapter * padapter, u8 levelNum, u8 RssiThresh, u8 RssiThresh1); u8 BTDM_CheckCoexRSSIState1(struct rtw_adapter * padapter, u8 levelNum, u8 RssiThresh, u8 RssiThresh1);
u8 BTDM_CheckCoexRSSIState(struct rtw_adapter * padapter, u8 levelNum, u8 RssiThresh, u8 RssiThresh1); u8 BTDM_CheckCoexRSSIState(struct rtw_adapter * padapter, u8 levelNum, u8 RssiThresh, u8 RssiThresh1);
u8 BTDM_DisableEDCATurbo(struct rtw_adapter * padapter);
#define BT_DisableEDCATurbo BTDM_DisableEDCATurbo
void BTDM_Balance(struct rtw_adapter * padapter, u8 bBalanceOn, u8 ms0, u8 ms1); void BTDM_Balance(struct rtw_adapter * padapter, u8 bBalanceOn, u8 ms0, u8 ms1);
void BTDM_AGCTable(struct rtw_adapter * padapter, u8 type); void BTDM_AGCTable(struct rtw_adapter * padapter, u8 type);
void BTDM_BBBackOffLevel(struct rtw_adapter * padapter, u8 type); void BTDM_BBBackOffLevel(struct rtw_adapter * padapter, u8 type);

5
drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h
View File

@ -30,6 +30,7 @@ void rtl8723a_BT_mediastatus_notify(struct rtw_adapter *padapter,
void rtl8723a_BT_specialpacket_notify(struct rtw_adapter *padapter); void rtl8723a_BT_specialpacket_notify(struct rtw_adapter *padapter);
void rtl8723a_BT_lps_leave(struct rtw_adapter *padapter); void rtl8723a_BT_lps_leave(struct rtw_adapter *padapter);
void rtl8723a_BT_disable_coexist(struct rtw_adapter *padapter); void rtl8723a_BT_disable_coexist(struct rtw_adapter *padapter);
bool rtl8723a_BT_disable_EDCA_turbo(struct rtw_adapter *padapter);
#else #else
static inline bool rtl8723a_BT_using_antenna_1(struct rtw_adapter *padapter) static inline bool rtl8723a_BT_using_antenna_1(struct rtw_adapter *padapter)
{ {
@ -49,6 +50,10 @@ static inline bool rtl8723a_BT_coexist(struct rtw_adapter *padapter)
#define rtl8723a_BT_specialpacket_notify(padapter) do {} while(0) #define rtl8723a_BT_specialpacket_notify(padapter) do {} while(0)
#define rtl8723a_BT_lps_leave(padapter) do {} while(0) #define rtl8723a_BT_lps_leave(padapter) do {} while(0)
#define rtl8723a_BT_disable_coexist(padapter) do {} while(0) #define rtl8723a_BT_disable_coexist(padapter) do {} while(0)
static inline bool rtl8723a_BT_disable_EDCA_turbo(struct rtw_adapter *padapter)
{
return false;
}
#endif #endif
#endif #endif