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

Commit c6821613 authored by Yan-Hsuan Chuang's avatar Yan-Hsuan Chuang Committed by Kalle Valo
Browse files

rtlwifi: btcoex: follow linux coding style 



Fix a number of checkpatch.pl warnings. In addition, some variable and
function names are shortened, and/or renamed to be more consistent.

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 27a31a60

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

+933 −945

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8192e2ant.h

+12 −12
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ struct coex_dm_8192e_2ant { 


	u32 backup_arfr_cnt1;	/* Auto Rate Fallback Retry cnt */

	u32 backup_arfr_cnt2;	/* Auto Rate Fallback Retry cnt */

	u16 backup_retrylimit;

	u16 backup_retry_limit;

	u8 backup_ampdu_maxtime;



	/* algorithm related */
@@ -125,18 +125,18 @@ struct coex_dm_8192e_2ant { 
	u8 bt_status;

	u8 wifi_chnl_info[3];



	u8 pre_sstype;

	u8 cur_sstype;

	u8 pre_ss_type;

	u8 cur_ss_type;



	u32 prera_mask;

	u32 curra_mask;

	u8 curra_masktype;

	u8 pre_arfrtype;

	u8 cur_arfrtype;

	u8 pre_retrylimit_type;

	u8 cur_retrylimit_type;

	u8 pre_ampdutime_type;

	u8 cur_ampdutime_type;

	u32 pre_ra_mask;

	u32 cur_ra_mask;

	u8 cur_ra_mask_type;

	u8 pre_arfr_type;

	u8 cur_arfr_type;

	u8 pre_retry_limit_type;

	u8 cur_retry_limit_type;

	u8 pre_ampdu_time_type;

	u8 cur_ampdu_time_type;

};



struct coex_sta_8192e_2ant {

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

+127 −289
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static struct coex_dm_8723b_1ant *coex_dm = &glcoex_dm_8723b_1ant; 
static struct coex_sta_8723b_1ant glcoex_sta_8723b_1ant;

static struct coex_sta_8723b_1ant *coex_sta = &glcoex_sta_8723b_1ant;



static const char *const GLBtInfoSrc8723b1Ant[] = {

static const char *const glbt_info_src_8723b_1ant[] = {

	"BT Info[wifi fw]",

	"BT Info[bt rsp]",

	"BT Info[bt auto report]",
@@ -67,7 +67,7 @@ static void halbtc8723b1ant_updatera_mask(struct btc_coexist *btcoexist, 
	coex_dm->curra_mask = dis_rate_mask;



	if (force_exec || (coex_dm->prera_mask != coex_dm->curra_mask))

		btcoexist->btc_set(btcoexist, BTC_SET_ACT_UPDATE_ra_mask,

		btcoexist->btc_set(btcoexist, BTC_SET_ACT_UPDATE_RAMASK,

				   &coex_dm->curra_mask);



	coex_dm->prera_mask = coex_dm->curra_mask;
@@ -148,8 +148,7 @@ static void halbtc8723b1ant_ampdu_maxtime(struct btc_coexist *btcoexist, 
					coex_dm->backup_ampdu_max_time);

			break;

		case 1:	/* AMPDU timw = 0x38 * 32us */

				btcoexist->btc_write_1byte(btcoexist,

							   0x456, 0x38);

			btcoexist->btc_write_1byte(btcoexist, 0x456, 0x38);

			break;

		default:

			break;
@@ -244,7 +243,8 @@ static void halbtc8723b1ant_query_bt_info(struct btc_coexist *btcoexist) 


	coex_sta->c2h_bt_info_req_sent = true;



	h2c_parameter[0] |= BIT0;	/* trigger*/

	/* trigger */

	h2c_parameter[0] |= BIT0;



	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

		 "[BTCoex], Query Bt Info, FW write 0x61 = 0x%x\n",
@@ -468,7 +468,8 @@ static void halbtc8723b1ant_coex_table_with_type(struct btc_coexist *btcoexist, 
	}

}



static void halbtc8723b1ant_SetFwIgnoreWlanAct(struct btc_coexist *btcoexist,

static void

halbtc8723b1ant_set_fw_ignore_wlan_act(struct btc_coexist *btcoexist,

				       bool enable)

{

	struct rtl_priv *rtlpriv = btcoexist->adapter;
@@ -504,7 +505,7 @@ static void halbtc8723b1ant_ignore_wlan_act(struct btc_coexist *btcoexist, 
		    coex_dm->cur_ignore_wlan_act)

			return;

	}

	halbtc8723b1ant_SetFwIgnoreWlanAct(btcoexist, enable);

	halbtc8723b1ant_set_fw_ignore_wlan_act(btcoexist, enable);



	coex_dm->pre_ignore_wlan_act = coex_dm->cur_ignore_wlan_act;

}
@@ -566,7 +567,7 @@ static void halbtc8723b1ant_set_lps_rpwm(struct btc_coexist *btcoexist, 
	btcoexist->btc_set(btcoexist, BTC_SET_U1_RPWM_VAL, &rpwm);

}



static void halbtc8723b1ant_LpsRpwm(struct btc_coexist *btcoexist,

static void halbtc8723b1ant_lps_rpwm(struct btc_coexist *btcoexist,

				     bool force_exec,

				     u8 lps_val, u8 rpwm_val)

{
@@ -609,7 +610,7 @@ static void halbtc8723b1ant_sw_mechanism(struct btc_coexist *btcoexist, 
	halbtc8723b1ant_low_penalty_ra(btcoexist, NORMAL_EXEC, low_penalty_ra);

}



static void halbtc8723b1ant_SetAntPath(struct btc_coexist *btcoexist,

static void halbtc8723b1ant_set_ant_path(struct btc_coexist *btcoexist,

					 u8 ant_pos_type, bool init_hw_cfg,

					 bool wifi_off)

{
@@ -683,8 +684,9 @@ static void halbtc8723b1ant_SetAntPath(struct btc_coexist *btcoexist, 
			}

		}



		/* fixed internal switch first*/

		/* fixed internal switch S1->WiFi, S0->BT*/

		/* fixed internal switch first

		 * fixed internal switch S1->WiFi, S0->BT

		 */

		if (board_info->btdm_ant_pos == BTC_ANTENNA_AT_MAIN_PORT)

			btcoexist->btc_write_2byte(btcoexist, 0x948, 0x0);

		else	/* fixed internal switch S0->WiFi, S1->BT */
@@ -762,8 +764,9 @@ static void halbtc8723b1ant_SetAntPath(struct btc_coexist *btcoexist, 
			}

		}



		/* fixed external switch first*/

		/*Main->WiFi, Aux->BT*/

		/* fixed external switch first

		 * Main->WiFi, Aux->BT

		 */

		if (board_info->btdm_ant_pos ==

			BTC_ANTENNA_AT_MAIN_PORT)

			btcoexist->btc_write_1byte_bitmask(btcoexist, 0x92c,
@@ -1001,20 +1004,25 @@ static void halbtc8723b1ant_ps_tdma(struct btc_coexist *btcoexist, 
		case 8: /* PTA Control */

			halbtc8723b1ant_set_fw_ps_tdma(btcoexist, 0x8, 0x0,

						       0x0, 0x0, 0x0);

			halbtc8723b1ant_SetAntPath(btcoexist, BTC_ANT_PATH_PTA,

			halbtc8723b1ant_set_ant_path(btcoexist,

						     BTC_ANT_PATH_PTA,

						     false, false);

			break;

		case 0:

		default:  /*Software control, Antenna at BT side */

		default:

			/* Software control, Antenna at BT side */

			halbtc8723b1ant_set_fw_ps_tdma(btcoexist, 0x0, 0x0,

						       0x0, 0x0, 0x0);

			halbtc8723b1ant_SetAntPath(btcoexist, BTC_ANT_PATH_BT,

			halbtc8723b1ant_set_ant_path(btcoexist,

						     BTC_ANT_PATH_BT,

						     false, false);

			break;

		case 9:   /*Software control, Antenna at WiFi side */

		case 9:

			/* Software control, Antenna at WiFi side */

			halbtc8723b1ant_set_fw_ps_tdma(btcoexist, 0x0, 0x0,

						       0x0, 0x0, 0x0);

			halbtc8723b1ant_SetAntPath(btcoexist, BTC_ANT_PATH_WIFI,

			halbtc8723b1ant_set_ant_path(btcoexist,

						     BTC_ANT_PATH_WIFI,

						     false, false);

			break;

		}
@@ -1029,189 +1037,15 @@ static void halbtc8723b1ant_ps_tdma(struct btc_coexist *btcoexist, 
	coex_dm->pre_ps_tdma = coex_dm->cur_ps_tdma;

}



static void btc8723b1ant_tdma_dur_adj_for_acl(struct btc_coexist *btcoexist,

					      u8 wifi_status)

{

	struct rtl_priv *rtlpriv = btcoexist->adapter;

	static s32 up, dn, m, n, wait_count;

	/* 0: no change, +1: increase WiFi duration,

	 * -1: decrease WiFi duration

	 */

	s32 result;

	u8 retry_count = 0, bt_info_ext;

	bool wifi_busy = false;



	RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

		 "[BTCoex], TdmaDurationAdjustForAcl()\n");



	if (BT_8723B_1ANT_WIFI_STATUS_CONNECTED_BUSY == wifi_status)

		wifi_busy = true;

	else

		wifi_busy = false;



	if ((BT_8723B_1ANT_WIFI_STATUS_NON_CONNECTED_ASSO_AUTH_SCAN ==

							 wifi_status) ||

	    (BT_8723B_1ANT_WIFI_STATUS_CONNECTED_SCAN == wifi_status) ||

	    (BT_8723B_1ANT_WIFI_STATUS_CONNECTED_SPECIAL_PKT == wifi_status)) {

		if (coex_dm->cur_ps_tdma != 1 && coex_dm->cur_ps_tdma != 2 &&

		    coex_dm->cur_ps_tdma != 3 && coex_dm->cur_ps_tdma != 9) {

			halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,

						true, 9);

			coex_dm->tdma_adj_type = 9;



			up = 0;

			dn = 0;

			m = 1;

			n = 3;

			result = 0;

			wait_count = 0;

		}

		return;

	}



	if (!coex_dm->auto_tdma_adjust) {

		coex_dm->auto_tdma_adjust = true;

		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

			 "[BTCoex], first run TdmaDurationAdjust()!!\n");



		halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 2);

		coex_dm->tdma_adj_type = 2;



		up = 0;

		dn = 0;

		m = 1;

		n = 3;

		result = 0;

		wait_count = 0;

	} else {

		/*accquire the BT TRx retry count from BT_Info byte2 */

		retry_count = coex_sta->bt_retry_cnt;

		bt_info_ext = coex_sta->bt_info_ext;

		result = 0;

		wait_count++;

		/* no retry in the last 2-second duration */

		if (retry_count == 0) {

			up++;

			dn--;



			if (dn <= 0)

				dn = 0;



			if (up >= n) {

				wait_count = 0;

				n = 3;

				up = 0;

				dn = 0;

				result = 1;

				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

					 "[BTCoex], Increase wifi duration!!\n");

			}

		} else if (retry_count <= 3) {

			up--;

			dn++;



			if (up <= 0)

				up = 0;



			if (dn == 2) {

				if (wait_count <= 2)

					m++;

				else

					m = 1;



				if (m >= 20)

					m = 20;



				n = 3 * m;

				up = 0;

				dn = 0;

				wait_count = 0;

				result = -1;

				RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

					 "[BTCoex], Decrease wifi duration for retryCounter<3!!\n");

			}

		} else {

			if (wait_count == 1)

				m++;

			else

				m = 1;



			if (m >= 20)

				m = 20;



			n = 3 * m;

			up = 0;

			dn = 0;

			wait_count = 0;

			result = -1;

			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

				 "[BTCoex], Decrease wifi duration for retryCounter>3!!\n");

		}



		if (result == -1) {

			if ((BT_INFO_8723B_1ANT_A2DP_BASIC_RATE(bt_info_ext)) &&

			    ((coex_dm->cur_ps_tdma == 1) ||

			     (coex_dm->cur_ps_tdma == 2))) {

				halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,

							true, 9);

				coex_dm->tdma_adj_type = 9;

			} else if (coex_dm->cur_ps_tdma == 1) {

				halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,

							true, 2);

				coex_dm->tdma_adj_type = 2;

			} else if (coex_dm->cur_ps_tdma == 2) {

				halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,

							true, 9);

				coex_dm->tdma_adj_type = 9;

			} else if (coex_dm->cur_ps_tdma == 9) {

				halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,

							true, 11);

				coex_dm->tdma_adj_type = 11;

			}

		} else if (result == 1) {

			if ((BT_INFO_8723B_1ANT_A2DP_BASIC_RATE(bt_info_ext)) &&

			    ((coex_dm->cur_ps_tdma == 1) ||

			     (coex_dm->cur_ps_tdma == 2))) {

				halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,

							true, 9);

				coex_dm->tdma_adj_type = 9;

			} else if (coex_dm->cur_ps_tdma == 11) {

				halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,

							true, 9);

				coex_dm->tdma_adj_type = 9;

			} else if (coex_dm->cur_ps_tdma == 9) {

				halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,

							true, 2);

				coex_dm->tdma_adj_type = 2;

			} else if (coex_dm->cur_ps_tdma == 2) {

				halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,

							true, 1);

				coex_dm->tdma_adj_type = 1;

			}

		} else {	  /*no change */

			/*if busy / idle change */

			RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

				 "[BTCoex],********* TDMA(on, %d) ********\n",

				 coex_dm->cur_ps_tdma);

		}



		if (coex_dm->cur_ps_tdma != 1 && coex_dm->cur_ps_tdma != 2 &&

		    coex_dm->cur_ps_tdma != 9 && coex_dm->cur_ps_tdma != 11) {

			/* recover to previous adjust type */

			halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true,

						coex_dm->tdma_adj_type);

		}

	}

}



static void btc8723b1ant_pstdmachkpwrsave(struct btc_coexist *btcoexist,

static void halbtc8723b1ant_ps_tdma_chk_pwr_save(struct btc_coexist *btcoexist,

						 bool new_ps_state)

{

	u8 lps_mode = 0x0;



	btcoexist->btc_get(btcoexist, BTC_GET_U1_LPS_MODE, &lps_mode);



	if (lps_mode) {	/* already under LPS state */

	if (lps_mode) {

		/* already under LPS state */

		if (new_ps_state) {

			/* keep state under LPS, do nothing. */

		} else {
@@ -1219,7 +1053,8 @@ static void btc8723b1ant_pstdmachkpwrsave(struct btc_coexist *btcoexist, 
			halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,

						false, 0);

		}

	} else {	/* NO PS state */

	} else {

		/* NO PS state */

		if (new_ps_state) {

			/* will enter LPS state, turn off psTdma first */

			halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,
@@ -1245,18 +1080,18 @@ static void halbtc8723b1ant_power_save_state(struct btc_coexist *btcoexist, 
		btcoexist->btc_set(btcoexist, BTC_SET_ACT_NORMAL_LPS, NULL);

		break;

	case BTC_PS_LPS_ON:

		btc8723b1ant_pstdmachkpwrsave(btcoexist, true);

		halbtc8723b1ant_LpsRpwm(btcoexist, NORMAL_EXEC, lps_val,

		halbtc8723b1ant_ps_tdma_chk_pwr_save(btcoexist, true);

		halbtc8723b1ant_lps_rpwm(btcoexist, NORMAL_EXEC, lps_val,

					 rpwm_val);

		/* when coex force to enter LPS, do not enter 32k low power. */

		/* when coex force to enter LPS, do not enter 32k low power */

		low_pwr_disable = true;

		btcoexist->btc_set(btcoexist, BTC_SET_ACT_DISABLE_LOW_POWER,

				   &low_pwr_disable);

		/* power save must executed before psTdma.	 */

		/* power save must executed before psTdma */

		btcoexist->btc_set(btcoexist, BTC_SET_ACT_ENTER_LPS, NULL);

		break;

	case BTC_PS_LPS_OFF:

		btc8723b1ant_pstdmachkpwrsave(btcoexist, false);

		halbtc8723b1ant_ps_tdma_chk_pwr_save(btcoexist, false);

		btcoexist->btc_set(btcoexist, BTC_SET_ACT_LEAVE_LPS, NULL);

		break;

	default:
@@ -1330,11 +1165,11 @@ static void btc8723b1ant_act_bt_sco_hid_only_busy(struct btc_coexist *btcoexist, 
			   &wifi_connected);



	/* tdma and coex table */



	if (bt_link_info->sco_exist) {

		halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 5);

		halbtc8723b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 2);

	} else { /* HID */

	} else {

		/* HID */

		halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 6);

		halbtc8723b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 5);

	}
@@ -1352,7 +1187,7 @@ static void halbtc8723b1ant_action_wifi_connected_bt_acl_busy( 
		coex_dm->auto_tdma_adjust = false;

		return;

	} else if (bt_link_info->a2dp_only) { /* A2DP */

		if (BT_8723B_1ANT_WIFI_STATUS_CONNECTED_IDLE == wifi_status) {

		if (wifi_status == BT_8723B_1ANT_WIFI_STATUS_CONNECTED_IDLE) {

			halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,

						false, 8);

			halbtc8723b1ant_coex_table_with_type(btcoexist,
@@ -1402,57 +1237,59 @@ static void btc8723b1ant_action_wifi_not_conn(struct btc_coexist *btcoexist) 
	halbtc8723b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0);

}



static void btc8723b1ant_action_wifi_not_conn_scan(struct btc_coexist *btcoex)

static void

btc8723b1ant_action_wifi_not_conn_scan(struct btc_coexist *btcoexist)

{

	struct btc_bt_link_info *bt_link_info = &btcoex->bt_link_info;

	struct btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info;



	halbtc8723b1ant_power_save_state(btcoex, BTC_PS_WIFI_NATIVE,

	halbtc8723b1ant_power_save_state(btcoexist, BTC_PS_WIFI_NATIVE,

					 0x0, 0x0);



	/* tdma and coex table */

	if (BT_8723B_1ANT_BT_STATUS_ACL_BUSY == coex_dm->bt_status) {

		if (bt_link_info->a2dp_exist && bt_link_info->pan_exist) {

			halbtc8723b1ant_ps_tdma(btcoex, NORMAL_EXEC,

			halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,

						true, 22);

			halbtc8723b1ant_coex_table_with_type(btcoex,

			halbtc8723b1ant_coex_table_with_type(btcoexist,

							     NORMAL_EXEC, 1);

		} else if (bt_link_info->pan_only) {

			halbtc8723b1ant_ps_tdma(btcoex, NORMAL_EXEC,

			halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,

						true, 20);

			halbtc8723b1ant_coex_table_with_type(btcoex,

			halbtc8723b1ant_coex_table_with_type(btcoexist,

							     NORMAL_EXEC, 2);

		} else {

			halbtc8723b1ant_ps_tdma(btcoex, NORMAL_EXEC,

			halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC,

						true, 20);

			halbtc8723b1ant_coex_table_with_type(btcoex,

			halbtc8723b1ant_coex_table_with_type(btcoexist,

							     NORMAL_EXEC, 1);

		}

	} else if ((BT_8723B_1ANT_BT_STATUS_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(btcoex,

		btc8723b1ant_act_bt_sco_hid_only_busy(btcoexist,

				BT_8723B_1ANT_WIFI_STATUS_CONNECTED_SCAN);

	} else {

		halbtc8723b1ant_ps_tdma(btcoex, NORMAL_EXEC, false, 8);

		halbtc8723b1ant_coex_table_with_type(btcoex, NORMAL_EXEC, 2);

		halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 8);

		halbtc8723b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 2);

	}

}



static void btc8723b1ant_act_wifi_not_conn_asso_auth(struct btc_coexist *btcoex)

static void

btc8723b1ant_act_wifi_not_conn_asso_auth(struct btc_coexist *btcoexist)

{

	struct btc_bt_link_info *bt_link_info = &btcoex->bt_link_info;

	struct btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info;



	halbtc8723b1ant_power_save_state(btcoex, BTC_PS_WIFI_NATIVE,

	halbtc8723b1ant_power_save_state(btcoexist, BTC_PS_WIFI_NATIVE,

					 0x0, 0x0);



	if ((BT_8723B_1ANT_BT_STATUS_CONNECTED_IDLE == coex_dm->bt_status) ||

	    (bt_link_info->sco_exist) || (bt_link_info->hid_only) ||

	    (bt_link_info->a2dp_only) || (bt_link_info->pan_only)) {

		halbtc8723b1ant_ps_tdma(btcoex, NORMAL_EXEC, false, 8);

		halbtc8723b1ant_coex_table_with_type(btcoex, NORMAL_EXEC, 7);

		halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 8);

		halbtc8723b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 7);

	} else {

		halbtc8723b1ant_ps_tdma(btcoex, NORMAL_EXEC, true, 20);

		halbtc8723b1ant_coex_table_with_type(btcoex, NORMAL_EXEC, 1);

		halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 20);

		halbtc8723b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 1);

	}

}
@@ -1663,14 +1500,13 @@ static void halbtc8723b1ant_run_coexist_mechanism(struct btc_coexist *btcoexist) 
	if (!bt_link_info->sco_exist && !bt_link_info->hid_exist) {

		halbtc8723b1ant_limited_tx(btcoexist, NORMAL_EXEC, 0, 0, 0, 0);

	} else {

		if (wifi_connected) {

		if (wifi_connected)

			halbtc8723b1ant_limited_tx(btcoexist,

						   NORMAL_EXEC, 1, 1, 1, 1);

		} else {

		else

			halbtc8723b1ant_limited_tx(btcoexist, NORMAL_EXEC,

						   0, 0, 0, 0);

	}

	}



	if (bt_link_info->sco_exist) {

		bt_ctrl_agg_buf_size = true;
@@ -1790,16 +1626,13 @@ static void halbtc8723b1ant_init_hw_config(struct btc_coexist *btcoexist, 
	btcoexist->btc_write_1byte_bitmask(btcoexist, 0x40, 0x20, 0x1);



	/* Antenna config */

	halbtc8723b1ant_SetAntPath(btcoexist, BTC_ANT_PATH_PTA, true, false);

	halbtc8723b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_PTA, true, false);

	/* PTA parameter */

	halbtc8723b1ant_coex_table_with_type(btcoexist, FORCE_EXEC, 0);

}



/**************************************************************

 * work around function start with wa_halbtc8723b1ant_

 **************************************************************/

/**************************************************************

 * extern function start with EXhalbtc8723b1ant_

 * extern function start with ex_halbtc8723b1ant_

 **************************************************************/



void ex_halbtc8723b1ant_init_hwconfig(struct btc_coexist *btcoexist)
@@ -1953,7 +1786,7 @@ void ex_halbtc8723b1ant_display_coex_info(struct btc_coexist *btcoexist) 
		if (coex_sta->bt_info_c2h_cnt[i]) {

			RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,

				 "\r\n %-35s = %7ph(%d)",

				 GLBtInfoSrc8723b1Ant[i],

				 glbt_info_src_8723b_1ant[i],

				 coex_sta->bt_info_c2h[i],

				 coex_sta->bt_info_c2h_cnt[i]);

		}
@@ -2111,7 +1944,7 @@ void ex_halbtc8723b1ant_ips_notify(struct btc_coexist *btcoexist, u8 type) 
			 "[BTCoex], IPS ENTER notify\n");

		coex_sta->under_ips = true;



		halbtc8723b1ant_SetAntPath(btcoexist, BTC_ANT_PATH_BT,

		halbtc8723b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_BT,

					     false, true);

		/* set PTA control */

		halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);
@@ -2187,14 +2020,17 @@ void ex_halbtc8723b1ant_scan_notify(struct btc_coexist *btcoexist, u8 type) 
	if (BTC_SCAN_START == type) {

		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

			 "[BTCoex], SCAN START notify\n");

		if (!wifi_connected)	/* non-connected scan */

		if (!wifi_connected)

			/* non-connected scan */

			btc8723b1ant_action_wifi_not_conn_scan(btcoexist);

		else	/* wifi is connected */

		else

			/* wifi is connected */

			btc8723b1ant_action_wifi_conn_scan(btcoexist);

	} else if (BTC_SCAN_FINISH == type) {

		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

			 "[BTCoex], SCAN FINISH notify\n");

		if (!wifi_connected)	/* non-connected scan */

		if (!wifi_connected)

			/* non-connected scan */

			btc8723b1ant_action_wifi_not_conn(btcoexist);

		else

			halbtc8723b1ant_action_wifi_connected(btcoexist);
@@ -2244,7 +2080,8 @@ void ex_halbtc8723b1ant_connect_notify(struct btc_coexist *btcoexist, u8 type) 


		btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_CONNECTED,

				   &wifi_connected);

		if (!wifi_connected) /* non-connected scan */

		if (!wifi_connected)

			/* non-connected scan */

			btc8723b1ant_action_wifi_not_conn(btcoexist);

		else

			halbtc8723b1ant_action_wifi_connected(btcoexist);
@@ -2433,7 +2270,8 @@ void ex_halbtc8723b1ant_bt_info_notify(struct btc_coexist *btcoexist, 
		coex_sta->a2dp_exist = false;

		coex_sta->hid_exist = false;

		coex_sta->sco_exist = false;

	} else { /* connection exists */

	} else {

		/* connection exists */

		coex_sta->bt_link_exist = true;

		if (bt_info & BT_INFO_8723B_1ANT_B_FTP)

			coex_sta->pan_exist = true;
@@ -2502,7 +2340,7 @@ void ex_halbtc8723b1ant_halt_notify(struct btc_coexist *btcoexist) 


	btcoexist->stop_coex_dm = true;



	halbtc8723b1ant_SetAntPath(btcoexist, BTC_ANT_PATH_BT, false, true);

	halbtc8723b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_BT, false, true);



	halbtc8723b1ant_ignore_wlan_act(btcoexist, FORCE_EXEC, true);
@@ -2523,7 +2361,7 @@ void ex_halbtc8723b1ant_pnp_notify(struct btc_coexist *btcoexist, u8 pnp_state) 
		RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

			 "[BTCoex], Pnp notify to SLEEP\n");

		btcoexist->stop_coex_dm = true;

		halbtc8723b1ant_SetAntPath(btcoexist, BTC_ANT_PATH_BT, false,

		halbtc8723b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_BT, false,

					     true);

		halbtc8723b1ant_power_save_state(btcoexist, BTC_PS_WIFI_NATIVE,

						 0x0, 0x0);

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

+171 −168

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.h

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ struct coex_sta_8723b_2ant { 
	bool c2h_bt_inquiry_page;

	u8 bt_retry_cnt;

	u8 bt_info_ext;

	u32 pop_event_cnt;

};



/*********************************************************************