Skip to content

L
linux
Commit 2d446a56 authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Kalle Valo
Browse files
Options

rtlwifi: btcoex: 23b 1ant: rename and coding style modification. 

Rename:
 * tdma_adj_type to ps_tdma_du_adj_type
 * wifiCentralChnl to wifi_central_chnl

Coding style:
 * move constant from right to left side in if-statement
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 158707f9
Show whitespace changes
Inline Side-by-side
Showing with 44 additions and 46 deletions
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c
View file @ 2d446a56
...@@ -1094,7 +1094,7 @@ void btc8723b1ant_tdma_dur_adj_for_acl(struct btc_coexist *btcoexist, ...@@ -1094,7 +1094,7 @@ void btc8723b1ant_tdma_dur_adj_for_acl(struct btc_coexist *btcoexist,
coex_dm->cur_ps_tdma != 3 && coex_dm->cur_ps_tdma != 9) { coex_dm->cur_ps_tdma != 3 && coex_dm->cur_ps_tdma != 9) {
halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,
true, 9); true, 9);
coex_dm->tdma_adj_type = 9; coex_dm->ps_tdma_du_adj_type = 9;
up = 0; up = 0;
dn = 0; dn = 0;
...@@ -1112,7 +1112,7 @@ void btc8723b1ant_tdma_dur_adj_for_acl(struct btc_coexist *btcoexist, ...@@ -1112,7 +1112,7 @@ void btc8723b1ant_tdma_dur_adj_for_acl(struct btc_coexist *btcoexist,
"[BTCoex], first run TdmaDurationAdjust()!!\n"); "[BTCoex], first run TdmaDurationAdjust()!!\n");
halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 2); halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 2);
coex_dm->tdma_adj_type = 2; coex_dm->ps_tdma_du_adj_type = 2;
up = 0; up = 0;
dn = 0; dn = 0;
...@@ -1191,19 +1191,19 @@ void btc8723b1ant_tdma_dur_adj_for_acl(struct btc_coexist *btcoexist, ...@@ -1191,19 +1191,19 @@ void btc8723b1ant_tdma_dur_adj_for_acl(struct btc_coexist *btcoexist,
(coex_dm->cur_ps_tdma == 2))) { (coex_dm->cur_ps_tdma == 2))) {
halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,
true, 9); true, 9);
coex_dm->tdma_adj_type = 9; coex_dm->ps_tdma_du_adj_type = 9;
} else if (coex_dm->cur_ps_tdma == 1) { } else if (coex_dm->cur_ps_tdma == 1) {
halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,
true, 2); true, 2);
coex_dm->tdma_adj_type = 2; coex_dm->ps_tdma_du_adj_type = 2;
} else if (coex_dm->cur_ps_tdma == 2) { } else if (coex_dm->cur_ps_tdma == 2) {
halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,
true, 9); true, 9);
coex_dm->tdma_adj_type = 9; coex_dm->ps_tdma_du_adj_type = 9;
} else if (coex_dm->cur_ps_tdma == 9) { } else if (coex_dm->cur_ps_tdma == 9) {
halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,
true, 11); true, 11);
coex_dm->tdma_adj_type = 11; coex_dm->ps_tdma_du_adj_type = 11;
} }
} else if (result == 1) { } else if (result == 1) {
if ((BT_INFO_8723B_1ANT_A2DP_BASIC_RATE(bt_info_ext)) && if ((BT_INFO_8723B_1ANT_A2DP_BASIC_RATE(bt_info_ext)) &&
...@@ -1211,19 +1211,19 @@ void btc8723b1ant_tdma_dur_adj_for_acl(struct btc_coexist *btcoexist, ...@@ -1211,19 +1211,19 @@ void btc8723b1ant_tdma_dur_adj_for_acl(struct btc_coexist *btcoexist,
(coex_dm->cur_ps_tdma == 2))) { (coex_dm->cur_ps_tdma == 2))) {
halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,
true, 9); true, 9);
coex_dm->tdma_adj_type = 9; coex_dm->ps_tdma_du_adj_type = 9;
} else if (coex_dm->cur_ps_tdma == 11) { } else if (coex_dm->cur_ps_tdma == 11) {
halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,
true, 9); true, 9);
coex_dm->tdma_adj_type = 9; coex_dm->ps_tdma_du_adj_type = 9;
} else if (coex_dm->cur_ps_tdma == 9) { } else if (coex_dm->cur_ps_tdma == 9) {
halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,
true, 2); true, 2);
coex_dm->tdma_adj_type = 2; coex_dm->ps_tdma_du_adj_type = 2;
} else if (coex_dm->cur_ps_tdma == 2) { } else if (coex_dm->cur_ps_tdma == 2) {
halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,
true, 1); true, 1);
coex_dm->tdma_adj_type = 1; coex_dm->ps_tdma_du_adj_type = 1;
} }
} else { } else {
/* if busy / idle change */ /* if busy / idle change */
...@@ -1236,7 +1236,7 @@ void btc8723b1ant_tdma_dur_adj_for_acl(struct btc_coexist *btcoexist, ...@@ -1236,7 +1236,7 @@ void btc8723b1ant_tdma_dur_adj_for_acl(struct btc_coexist *btcoexist,
coex_dm->cur_ps_tdma != 9 && coex_dm->cur_ps_tdma != 11) { coex_dm->cur_ps_tdma != 9 && coex_dm->cur_ps_tdma != 11) {
/* recover to previous adjust type */ /* recover to previous adjust type */
halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true,
coex_dm->tdma_adj_type); coex_dm->ps_tdma_du_adj_type);
} }
} }
} }
...@@ -1501,7 +1501,7 @@ btc8723b1ant_action_wifi_not_conn_scan(struct btc_coexist *btcoexist) ...@@ -1501,7 +1501,7 @@ btc8723b1ant_action_wifi_not_conn_scan(struct btc_coexist *btcoexist)
0x0, 0x0); 0x0, 0x0);
/* tdma and coex table */ /* tdma and coex table */
if (BT_8723B_1ANT_BT_STATUS_ACL_BUSY == coex_dm->bt_status) { if (coex_dm->bt_status == BT_8723B_1ANT_BT_STATUS_ACL_BUSY) {
if (bt_link_info->a2dp_exist && bt_link_info->pan_exist) { if (bt_link_info->a2dp_exist && bt_link_info->pan_exist) {
halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,
true, 22); true, 22);
...@@ -1518,9 +1518,8 @@ btc8723b1ant_action_wifi_not_conn_scan(struct btc_coexist *btcoexist) ...@@ -1518,9 +1518,8 @@ btc8723b1ant_action_wifi_not_conn_scan(struct btc_coexist *btcoexist)
halbtc8723b1ant_coex_table_with_type(btcoexist, halbtc8723b1ant_coex_table_with_type(btcoexist,
NORMAL_EXEC, 1); NORMAL_EXEC, 1);
} }
} else if ((BT_8723B_1ANT_BT_STATUS_SCO_BUSY == coex_dm->bt_status) || } else if (coex_dm->bt_status == BT_8723B_1ANT_BT_STATUS_SCO_BUSY ||
(BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY == coex_dm->bt_status == BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY){
coex_dm->bt_status)){
btc8723b1ant_act_bt_sco_hid_only_busy(btcoexist, btc8723b1ant_act_bt_sco_hid_only_busy(btcoexist,
BT_8723B_1ANT_WIFI_STATUS_CONNECTED_SCAN); BT_8723B_1ANT_WIFI_STATUS_CONNECTED_SCAN);
} else { } else {
...@@ -1556,7 +1555,7 @@ static void btc8723b1ant_action_wifi_conn_scan(struct btc_coexist *btcoexist) ...@@ -1556,7 +1555,7 @@ static void btc8723b1ant_action_wifi_conn_scan(struct btc_coexist *btcoexist)
0x0, 0x0); 0x0, 0x0);
/* tdma and coex table */ /* tdma and coex table */
if (BT_8723B_1ANT_BT_STATUS_ACL_BUSY == coex_dm->bt_status) { if (coex_dm->bt_status == BT_8723B_1ANT_BT_STATUS_ACL_BUSY) {
if (bt_link_info->a2dp_exist && bt_link_info->pan_exist) { if (bt_link_info->a2dp_exist && bt_link_info->pan_exist) {
halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,
true, 22); true, 22);
...@@ -1573,9 +1572,8 @@ static void btc8723b1ant_action_wifi_conn_scan(struct btc_coexist *btcoexist) ...@@ -1573,9 +1572,8 @@ static void btc8723b1ant_action_wifi_conn_scan(struct btc_coexist *btcoexist)
halbtc8723b1ant_coex_table_with_type(btcoexist, halbtc8723b1ant_coex_table_with_type(btcoexist,
NORMAL_EXEC, 1); NORMAL_EXEC, 1);
} }
} else if ((BT_8723B_1ANT_BT_STATUS_SCO_BUSY == coex_dm->bt_status) || } else if (coex_dm->bt_status == BT_8723B_1ANT_BT_STATUS_SCO_BUSY ||
(BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY == coex_dm->bt_status == BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY) {
coex_dm->bt_status)) {
btc8723b1ant_act_bt_sco_hid_only_busy(btcoexist, btc8723b1ant_act_bt_sco_hid_only_busy(btcoexist,
BT_8723B_1ANT_WIFI_STATUS_CONNECTED_SCAN); BT_8723B_1ANT_WIFI_STATUS_CONNECTED_SCAN);
} else { } else {
...@@ -1646,7 +1644,7 @@ static void halbtc8723b1ant_action_wifi_connected(struct btc_coexist *btcoexist) ...@@ -1646,7 +1644,7 @@ static void halbtc8723b1ant_action_wifi_connected(struct btc_coexist *btcoexist)
btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &wifi_busy); btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &wifi_busy);
/* power save state */ /* power save state */
if (!ap_enable && if (!ap_enable &&
BT_8723B_1ANT_BT_STATUS_ACL_BUSY == coex_dm->bt_status && coex_dm->bt_status == BT_8723B_1ANT_BT_STATUS_ACL_BUSY &&
!btcoexist->bt_link_info.hid_only) { !btcoexist->bt_link_info.hid_only) {
if (!wifi_busy && btcoexist->bt_link_info.a2dp_only) if (!wifi_busy && btcoexist->bt_link_info.a2dp_only)
halbtc8723b1ant_power_save_state(btcoexist, halbtc8723b1ant_power_save_state(btcoexist,
...@@ -1662,13 +1660,14 @@ static void halbtc8723b1ant_action_wifi_connected(struct btc_coexist *btcoexist) ...@@ -1662,13 +1660,14 @@ static void halbtc8723b1ant_action_wifi_connected(struct btc_coexist *btcoexist)
} }
/* tdma and coex table */ /* tdma and coex table */
if (!wifi_busy) { if (!wifi_busy) {
if (BT_8723B_1ANT_BT_STATUS_ACL_BUSY == coex_dm->bt_status) { if (coex_dm->bt_status == BT_8723B_1ANT_BT_STATUS_ACL_BUSY) {
halbtc8723b1ant_action_wifi_connected_bt_acl_busy(btcoexist, halbtc8723b1ant_action_wifi_connected_bt_acl_busy(
btcoexist,
BT_8723B_1ANT_WIFI_STATUS_CONNECTED_IDLE); BT_8723B_1ANT_WIFI_STATUS_CONNECTED_IDLE);
} else if ((BT_8723B_1ANT_BT_STATUS_SCO_BUSY == } else if (coex_dm->bt_status ==
coex_dm->bt_status) || BT_8723B_1ANT_BT_STATUS_SCO_BUSY ||
(BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY == coex_dm->bt_status ==
coex_dm->bt_status)) { BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY) {
btc8723b1ant_act_bt_sco_hid_only_busy(btcoexist, btc8723b1ant_act_bt_sco_hid_only_busy(btcoexist,
BT_8723B_1ANT_WIFI_STATUS_CONNECTED_IDLE); BT_8723B_1ANT_WIFI_STATUS_CONNECTED_IDLE);
} else { } else {
...@@ -1678,13 +1677,14 @@ static void halbtc8723b1ant_action_wifi_connected(struct btc_coexist *btcoexist) ...@@ -1678,13 +1677,14 @@ static void halbtc8723b1ant_action_wifi_connected(struct btc_coexist *btcoexist)
NORMAL_EXEC, 2); NORMAL_EXEC, 2);
} }
} else { } else {
if (BT_8723B_1ANT_BT_STATUS_ACL_BUSY == coex_dm->bt_status) { if (coex_dm->bt_status == BT_8723B_1ANT_BT_STATUS_ACL_BUSY) {
halbtc8723b1ant_action_wifi_connected_bt_acl_busy(btcoexist, halbtc8723b1ant_action_wifi_connected_bt_acl_busy(
btcoexist,
BT_8723B_1ANT_WIFI_STATUS_CONNECTED_BUSY); BT_8723B_1ANT_WIFI_STATUS_CONNECTED_BUSY);
} else if ((BT_8723B_1ANT_BT_STATUS_SCO_BUSY == } else if (coex_dm->bt_status ==
coex_dm->bt_status) || BT_8723B_1ANT_BT_STATUS_SCO_BUSY ||
(BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY == coex_dm->bt_status ==
coex_dm->bt_status)) { BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY) {
btc8723b1ant_act_bt_sco_hid_only_busy(btcoexist, btc8723b1ant_act_bt_sco_hid_only_busy(btcoexist,
BT_8723B_1ANT_WIFI_STATUS_CONNECTED_BUSY); BT_8723B_1ANT_WIFI_STATUS_CONNECTED_BUSY);
} else { } else {
...@@ -1728,11 +1728,10 @@ static void halbtc8723b1ant_run_coexist_mechanism(struct btc_coexist *btcoexist) ...@@ -1728,11 +1728,10 @@ static void halbtc8723b1ant_run_coexist_mechanism(struct btc_coexist *btcoexist)
return; return;
} }
if ((BT_8723B_1ANT_BT_STATUS_ACL_BUSY == coex_dm->bt_status) || if (coex_dm->bt_status == BT_8723B_1ANT_BT_STATUS_ACL_BUSY ||
(BT_8723B_1ANT_BT_STATUS_SCO_BUSY == coex_dm->bt_status) || coex_dm->bt_status == BT_8723B_1ANT_BT_STATUS_SCO_BUSY ||
(BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY == coex_dm->bt_status)) { coex_dm->bt_status == BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY)
increase_scan_dev_num = true; increase_scan_dev_num = true;
}
btcoexist->btc_set(btcoexist, BTC_SET_BL_INC_SCAN_DEV_NUM, btcoexist->btc_set(btcoexist, BTC_SET_BL_INC_SCAN_DEV_NUM,
&increase_scan_dev_num); &increase_scan_dev_num);
...@@ -2349,7 +2348,7 @@ void ex_halbtc8723b1ant_media_status_notify(struct btc_coexist *btcoexist, ...@@ -2349,7 +2348,7 @@ void ex_halbtc8723b1ant_media_status_notify(struct btc_coexist *btcoexist,
struct rtl_priv *rtlpriv = btcoexist->adapter; struct rtl_priv *rtlpriv = btcoexist->adapter;
u8 h2c_parameter[3] = {0}; u8 h2c_parameter[3] = {0};
u32 wifi_bw; u32 wifi_bw;
u8 wifiCentralChnl; u8 wifi_central_chnl;
if (btcoexist->manual_control || btcoexist->stop_coex_dm || if (btcoexist->manual_control || btcoexist->stop_coex_dm ||
btcoexist->bt_info.bt_disabled) btcoexist->bt_info.bt_disabled)
...@@ -2364,12 +2363,11 @@ void ex_halbtc8723b1ant_media_status_notify(struct btc_coexist *btcoexist, ...@@ -2364,12 +2363,11 @@ void ex_halbtc8723b1ant_media_status_notify(struct btc_coexist *btcoexist,
/* only 2.4G we need to inform bt the chnl mask */ /* only 2.4G we need to inform bt the chnl mask */
btcoexist->btc_get(btcoexist, BTC_GET_U1_WIFI_CENTRAL_CHNL, btcoexist->btc_get(btcoexist, BTC_GET_U1_WIFI_CENTRAL_CHNL,
&wifiCentralChnl); &wifi_central_chnl);
if ((BTC_MEDIA_CONNECT == type) && if (type == BTC_MEDIA_CONNECT && wifi_central_chnl <= 14) {
(wifiCentralChnl <= 14)) {
h2c_parameter[0] = 0x0; h2c_parameter[0] = 0x0;
h2c_parameter[1] = wifiCentralChnl; h2c_parameter[1] = wifi_central_chnl;
btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &wifi_bw); btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &wifi_bw);
if (BTC_WIFI_BW_HT40 == wifi_bw) if (BTC_WIFI_BW_HT40 == wifi_bw)
h2c_parameter[2] = 0x30; h2c_parameter[2] = 0x30;
...@@ -2464,7 +2462,7 @@ void ex_halbtc8723b1ant_bt_info_notify(struct btc_coexist *btcoexist, ...@@ -2464,7 +2462,7 @@ void ex_halbtc8723b1ant_bt_info_notify(struct btc_coexist *btcoexist,
"0x%02x, ", tmp_buf[i]); "0x%02x, ", tmp_buf[i]);
} }
if (BT_INFO_SRC_8723B_1ANT_WIFI_FW != rsp_source) { if (rsp_source != BT_INFO_SRC_8723B_1ANT_WIFI_FW) {
coex_sta->bt_retry_cnt = /* [3:0] */ coex_sta->bt_retry_cnt = /* [3:0] */
coex_sta->bt_info_c2h[rsp_source][2] & 0xf; coex_sta->bt_info_c2h[rsp_source][2] & 0xf;
......
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.h
View file @ 2d446a56
...@@ -88,7 +88,7 @@ struct coex_dm_8723b_1ant { ...@@ -88,7 +88,7 @@ struct coex_dm_8723b_1ant {
u8 pre_ps_tdma; u8 pre_ps_tdma;
u8 cur_ps_tdma; u8 cur_ps_tdma;
u8 ps_tdma_para[5]; u8 ps_tdma_para[5];
u8 tdma_adj_type; u8 ps_tdma_du_adj_type;
bool auto_tdma_adjust; bool auto_tdma_adjust;
bool pre_ps_tdma_on; bool pre_ps_tdma_on;
bool cur_ps_tdma_on; bool cur_ps_tdma_on;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7