staging: rtl8723au: Rename BT_WifiAssociateNotify() rtl8723a_BT_wifiassociate_notify() (c814d4d6) · Commits · 戴 / test

drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -145,7 +145,7 @@ void rtl8723a_BT_wifiscan_notify(struct rtw_adapter *padapter, u8 scanType)
		BTDM_WifiScanNotify(padapter, scanType);
		}

		void BT_WifiAssociateNotify(struct rtw_adapter *padapter, u8 action)
		void rtl8723a_BT_wifiassociate_notify(struct rtw_adapter *padapter, u8 action)
		{
		/* action : */
		/* true = associate start */

+2 −4

Original line number	Diff line number	Diff line
		@@ -2558,20 +2558,18 @@ void hw_var_set_mlme_join(struct rtw_adapter *padapter, u8 type)
		RetryLimit << RETRY_LIMIT_SHORT_SHIFT \| RetryLimit <<
		RETRY_LIMIT_LONG_SHIFT);

		#ifdef CONFIG_8723AU_BT_COEXIST
		switch (type) {
		case 0:
		/* prepare to join */
		BT_WifiAssociateNotify(padapter, true);
		rtl8723a_BT_wifiassociate_notify(padapter, true);
		break;
		case 1:
		/* joinbss_event callback when join res < 0 */
		BT_WifiAssociateNotify(padapter, false);
		rtl8723a_BT_wifiassociate_notify(padapter, false);
		break;
		case 2:
		/* sta add event callback */
		/* BT_WifiMediaStatusNotify(padapter, RT_MEDIA_CONNECT); */
		break;
		}
		#endif
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -31,8 +31,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_SpecialPacketNotify(struct rtw_adapter * padapter);
		void BT_HaltProcess(struct rtw_adapter * padapter);
		void BT_LpsLeave(struct rtw_adapter * padapter);

+2 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ void rtl8723a_BT_disable_coexist(struct rtw_adapter *padapter);
		bool rtl8723a_BT_disable_EDCA_turbo(struct rtw_adapter *padapter);
		void rtl8723a_dual_antenna_detection(struct rtw_adapter *padapter);
		void rtl8723a_BT_init_hwconfig(struct rtw_adapter *padapter);
		void rtl8723a_BT_wifiassociate_notify(struct rtw_adapter *padapter, u8 action);
		#else
		static inline bool rtl8723a_BT_using_antenna_1(struct rtw_adapter *padapter)
		{
		@@ -58,6 +59,7 @@ static inline bool rtl8723a_BT_disable_EDCA_turbo(struct rtw_adapter *padapter)
		}
		#define rtl8723a_dual_antenna_detection(padapter) do {} while(0)
		#define rtl8723a_BT_init_hwconfig(padapter) do {} while(0)
		#define rtl8723a_BT_wifiassociate_notify(padapter, action) do {} while(0)
		#endif

		#endif