Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12e87c09 authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Kalle Valo
Browse files

rtlwifi: btcoex: 23b 1ant: monitor bt is enabled or disabled 



Check BT's status, and record it in field bt_disabled. When BT is disabled,
We do special action called wifi_only.  Also, we move the field from
'struct btc_coexist' to 'struct coex_sta_8723b_1ant'.

Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Yan-Hsuan Chuang <yhchuang@realtek.com>
Cc: Birming Chiu <birming@realtek.com>
Cc: Shaofu <shaofu@realtek.com>
Cc: Steven Ting <steventing@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 75717802

drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c

+4 −4
Original line number Diff line number Diff line
@@ -2136,7 +2136,7 @@ void ex_halbtc8723b1ant_display_coex_info(struct btc_coexist *btcoexist) 


	RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = [%s/ %d/ %d] ",

		 "BT [status/ rssi/ retryCnt]",

		 ((btcoexist->bt_info.bt_disabled) ? ("disabled") :

		 ((coex_sta->bt_disabled) ? ("disabled") :

		  ((coex_sta->c2h_bt_inquiry_page) ? ("inquiry/page scan") :

		   ((BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE ==

		     coex_dm->bt_status) ?
@@ -2422,7 +2422,7 @@ void ex_halbtc8723b1ant_connect_notify(struct btc_coexist *btcoexist, u8 type) 
	u8 agg_buf_size = 5;



	if (btcoexist->manual_control || btcoexist->stop_coex_dm ||

	    btcoexist->bt_info.bt_disabled)

	    coex_sta->bt_disabled)

		return;



	btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_LINK_STATUS,
@@ -2472,7 +2472,7 @@ void ex_halbtc8723b1ant_media_status_notify(struct btc_coexist *btcoexist, 
	u8 wifi_central_chnl;



	if (btcoexist->manual_control || btcoexist->stop_coex_dm ||

	    btcoexist->bt_info.bt_disabled)

	    coex_sta->bt_disabled)

		return;



	if (BTC_MEDIA_CONNECT == type)
@@ -2519,7 +2519,7 @@ void ex_halbtc8723b1ant_special_packet_notify(struct btc_coexist *btcoexist, 
	u8 agg_buf_size = 5;



	if (btcoexist->manual_control || btcoexist->stop_coex_dm ||

	    btcoexist->bt_info.bt_disabled)

	    coex_sta->bt_disabled)

		return;



	btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_LINK_STATUS,