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

staging: rtl8723au: Rename BTDM_Coexist() to rtl8723a_BT_do_coexist() 

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:27 +02:00 committed by Greg Kroah-Hartman
parent ef95e276a8
commit febf30876e
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/rtl8723au/core/rtw_cmd.c
View File

@ -1039,12 +1039,10 @@ static void dynamic_chk_wk_hdl(struct rtw_adapter *padapter, u8 *pbuf, int sz)
rtl8723a_HalDmWatchDog(padapter);
#ifdef CONFIG_8723AU_BT_COEXIST
/* */
/* BT-Coexist */
/* */
BT_CoexistMechanism(padapter);
#endif
rtl8723a_BT_do_coexist(padapter);
}
static void lps_ctrl_wk_hdl(struct rtw_adapter *padapter, u8 lps_ctrl_type)

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

@ -10766,7 +10766,7 @@ void BTDM_SignalCompensation(struct rtw_adapter *padapter, u8 *rssi_wifi, u8 *rs
BTDM_8723ASignalCompensation(padapter, rssi_wifi, rssi_bt);
}
void BTDM_Coexist(struct rtw_adapter *padapter)
void rtl8723a_BT_do_coexist(struct rtw_adapter *padapter)
{
struct hal_data_8723a *pHalData = GET_HAL_DATA(padapter);
@ -11347,7 +11347,7 @@ u8 HALBT_BTChipType(struct rtw_adapter *padapter)
void HALBT_InitHwConfig(struct rtw_adapter *padapter)
{
halbt_InitHwConfig8723A(padapter);
BTDM_Coexist(padapter);
rtl8723a_BT_do_coexist(padapter);
}
void HALBT_SetRtsCtsNoLenLimit(struct rtw_adapter *padapter)

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

@ -1571,8 +1571,6 @@ void BTDM_HWCoexAllOff(struct rtw_adapter * padapter);
void BTDM_CoexAllOff(struct rtw_adapter * padapter);
void BTDM_TurnOffBtCoexistBeforeEnterIPS(struct rtw_adapter * padapter);
void BTDM_SignalCompensation(struct rtw_adapter * padapter, u8 *rssi_wifi, u8 *rssi_bt);
void BTDM_Coexist(struct rtw_adapter * padapter);
#define BT_CoexistMechanism BTDM_Coexist
void BTDM_UpdateCoexState(struct rtw_adapter * padapter);
u8 BTDM_IsSameCoexistState(struct rtw_adapter * padapter);
void BTDM_PWDBMonitor(struct rtw_adapter * padapter);

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

@ -22,6 +22,7 @@
bool rtl8723a_BT_using_antenna_1(struct rtw_adapter *padapter);
bool rtl8723a_BT_enabled(struct rtw_adapter *padapter);
bool rtl8723a_BT_coexist(struct rtw_adapter *padapter);
void rtl8723a_BT_do_coexist(struct rtw_adapter *padapter);
#else
static inline bool rtl8723a_BT_using_antenna_1(struct rtw_adapter *padapter)
{
@ -35,6 +36,7 @@ static inline bool rtl8723a_BT_coexist(struct rtw_adapter *padapter)
{
return false;
}
#define rtl8723a_BT_do_coexist(padapter) do {} while(0)
#endif
#endif