staging: rtl8723au: Rename BT_WifiMediaStatusNotify() rtl8723a_BT_mediastatus_notify() (43de0304) · Commits · 戴 / test

drivers/staging/rtl8723au/core/rtw_cmd.c

+3 −9

Original line number	Diff line number	Diff line
		@@ -1072,19 +1072,13 @@ static void lps_ctrl_wk_hdl(struct rtw_adapter *padapter, u8 lps_ctrl_type)
		/* Reset LPS Setting */
		padapter->pwrctrlpriv.LpsIdleCount = 0;
		rtl8723a_set_FwJoinBssReport_cmd(padapter, 1);
		#ifdef CONFIG_8723AU_BT_COEXIST
		BT_WifiMediaStatusNotify(padapter, mstatus);
		#endif
		rtl8723a_BT_mediastatus_notify(padapter, mstatus);
		break;
		case LPS_CTRL_DISCONNECT:
		mstatus = 0;/* disconnect */
		#ifdef CONFIG_8723AU_BT_COEXIST
		BT_WifiMediaStatusNotify(padapter, mstatus);
		if (rtl8723a_BT_using_antenna_1(padapter) == false)
		#endif
		{
		rtl8723a_BT_mediastatus_notify(padapter, mstatus);
		if (!rtl8723a_BT_using_antenna_1(padapter))
		LPS_Leave23a(padapter);
		}
		rtl8723a_set_FwJoinBssReport_cmd(padapter, 0);
		break;
		case LPS_CTRL_SPECIAL_PACKET:

+2 −6

Original line number	Diff line number	Diff line
		@@ -156,11 +156,6 @@ void BT_WifiAssociateNotify(struct rtw_adapter *padapter, u8 action)
		BTDM_WifiAssociateNotify(padapter, action);
		}

		void BT_WifiMediaStatusNotify(struct rtw_adapter *padapter, enum rt_media_status mstatus)
		{
		BTDM_MediaStatusNotify(padapter, mstatus);
		}

		void BT_SpecialPacketNotify(struct rtw_adapter *padapter)
		{
		BTDM_ForDhcp(padapter);
		@@ -11003,7 +10998,8 @@ void BTDM_WifiAssociateNotify(struct rtw_adapter *padapter, u8 action)
		BTDM_WifiAssociateNotify8723A(padapter, action);
		}

		void BTDM_MediaStatusNotify(struct rtw_adapter *padapter, enum rt_media_status mstatus)
		void rtl8723a_BT_mediastatus_notify(struct rtw_adapter *padapter,
		enum rt_media_status mstatus)
		{
		if (!rtl8723a_BT_coexist(padapter))
		return;

+0 −2

Original line number	Diff line number	Diff line
		@@ -32,8 +32,6 @@ enum rt_media_status {
		void BT_SignalCompensation(struct rtw_adapter *padapter,
		u8 rssi_wifi, u8 rssi_bt);
		void BT_WifiAssociateNotify(struct rtw_adapter *padapter, u8 action);
		void BT_WifiMediaStatusNotify(struct rtw_adapter *padapter,
		enum rt_media_status mstatus);
		void BT_SpecialPacketNotify(struct rtw_adapter * padapter);
		void BT_HaltProcess(struct rtw_adapter * padapter);
		void BT_LpsLeave(struct rtw_adapter * padapter);

+4 −0

Original line number	Diff line number	Diff line
		@@ -19,11 +19,14 @@
		#include <drv_types.h>

		#ifdef CONFIG_8723AU_BT_COEXIST
		enum rt_media_status;
		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);
		void rtl8723a_BT_wifiscan_notify(struct rtw_adapter *padapter, u8 scanType);
		void rtl8723a_BT_mediastatus_notify(struct rtw_adapter *padapter,
		enum rt_media_status mstatus);
		#else
		static inline bool rtl8723a_BT_using_antenna_1(struct rtw_adapter *padapter)
		{
		@@ -39,6 +42,7 @@ static inline bool rtl8723a_BT_coexist(struct rtw_adapter *padapter)
		}
		#define rtl8723a_BT_do_coexist(padapter) do {} while(0)
		#define rtl8723a_BT_wifiscan_notify(padapter, scanType) do {} while(0)
		#define rtl8723a_BT_mediastatus_notify(padapter, mstatus) do {} while(0)
		#endif

		#endif