Commit 19afb922 authored by Yan-Hsuan Chuang's avatar Yan-Hsuan Chuang Committed by Kalle Valo

rtlwifi: btcoex: 21a 1ant: move bt_disabled to global struct

Move the bt disable flag to a global structure to indicate that bt is
turned off.
Signed-off-by: default avatarYan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Pkshih <pkshih@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 bcdffd05
...@@ -2168,7 +2168,7 @@ void ex_btc8821a1ant_display_coex_info(struct btc_coexist *btcoexist) ...@@ -2168,7 +2168,7 @@ void ex_btc8821a1ant_display_coex_info(struct btc_coexist *btcoexist)
"uplink" : "downlink"))); "uplink" : "downlink")));
RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
"\r\n %-35s = [%s/ %d/ %d] ", "BT [status/ rssi/ retryCnt]", "\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") : ((coex_sta->c2h_bt_inquiry_page) ? ("inquiry/page scan") :
((BT_8821A_1ANT_BT_STATUS_NON_CONNECTED_IDLE == ((BT_8821A_1ANT_BT_STATUS_NON_CONNECTED_IDLE ==
coex_dm->bt_status) ? coex_dm->bt_status) ?
...@@ -2394,9 +2394,10 @@ void ex_btc8821a1ant_scan_notify(struct btc_coexist *btcoexist, u8 type) ...@@ -2394,9 +2394,10 @@ void ex_btc8821a1ant_scan_notify(struct btc_coexist *btcoexist, u8 type)
u32 num_of_wifi_link = 0; u32 num_of_wifi_link = 0;
u8 agg_buf_size = 5; u8 agg_buf_size = 5;
if (btcoexist->manual_control || if (btcoexist->manual_control || btcoexist->stop_coex_dm)
btcoexist->stop_coex_dm || return;
btcoexist->bt_info.bt_disabled)
if (coex_sta->bt_disabled)
return; return;
btcoexist->btc_get(btcoexist, btcoexist->btc_get(btcoexist,
...@@ -2456,9 +2457,8 @@ void ex_btc8821a1ant_connect_notify(struct btc_coexist *btcoexist, u8 type) ...@@ -2456,9 +2457,8 @@ void ex_btc8821a1ant_connect_notify(struct btc_coexist *btcoexist, u8 type)
bool bt_ctrl_agg_buf_size = false; bool bt_ctrl_agg_buf_size = false;
u8 agg_buf_size = 5; u8 agg_buf_size = 5;
if (btcoexist->manual_control || if (btcoexist->manual_control || btcoexist->stop_coex_dm ||
btcoexist->stop_coex_dm || coex_sta->bt_disabled)
btcoexist->bt_info.bt_disabled)
return; return;
btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_LINK_STATUS, btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_LINK_STATUS,
...@@ -2508,9 +2508,8 @@ void ex_btc8821a1ant_media_status_notify(struct btc_coexist *btcoexist, ...@@ -2508,9 +2508,8 @@ void ex_btc8821a1ant_media_status_notify(struct btc_coexist *btcoexist,
u32 wifi_bw; u32 wifi_bw;
u8 wifi_central_chnl; u8 wifi_central_chnl;
if (btcoexist->manual_control || if (btcoexist->manual_control || btcoexist->stop_coex_dm ||
btcoexist->stop_coex_dm || coex_sta->bt_disabled)
btcoexist->bt_info.bt_disabled)
return; return;
if (BTC_MEDIA_CONNECT == type) { if (BTC_MEDIA_CONNECT == type) {
...@@ -2559,9 +2558,8 @@ void ex_btc8821a1ant_special_packet_notify(struct btc_coexist *btcoexist, ...@@ -2559,9 +2558,8 @@ void ex_btc8821a1ant_special_packet_notify(struct btc_coexist *btcoexist,
u32 num_of_wifi_link = 0; u32 num_of_wifi_link = 0;
u8 agg_buf_size = 5; u8 agg_buf_size = 5;
if (btcoexist->manual_control || if (btcoexist->manual_control || btcoexist->stop_coex_dm ||
btcoexist->stop_coex_dm || coex_sta->bt_disabled)
btcoexist->bt_info.bt_disabled)
return; return;
coex_sta->special_pkt_period_cnt = 0; coex_sta->special_pkt_period_cnt = 0;
......
...@@ -140,6 +140,7 @@ struct coex_dm_8821a_1ant { ...@@ -140,6 +140,7 @@ struct coex_dm_8821a_1ant {
}; };
struct coex_sta_8821a_1ant { struct coex_sta_8821a_1ant {
bool bt_disabled;
bool bt_link_exist; bool bt_link_exist;
bool sco_exist; bool sco_exist;
bool a2dp_exist; bool a2dp_exist;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment