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

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

rtlwifi: btcoex: rename ex_halbtc*ant to ex_btc*ant 



These external functions are for BT-coexistence, so remove the "hal"
prefix for consistancy.

Signed-off-by: default avatarYan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Ping-Ke Shih <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 d178b132

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

+16 −16
Original line number Diff line number Diff line
@@ -164,20 +164,20 @@ struct coex_sta_8192e_2ant { 
/****************************************************************

 *    The following is interface which will notify coex module.

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

void ex_halbtc8192e2ant_init_hwconfig(struct btc_coexist *btcoexist);

void ex_halbtc8192e2ant_init_coex_dm(struct btc_coexist *btcoexist);

void ex_halbtc8192e2ant_ips_notify(struct btc_coexist *btcoexist, u8 type);

void ex_halbtc8192e2ant_lps_notify(struct btc_coexist *btcoexist, u8 type);

void ex_halbtc8192e2ant_scan_notify(struct btc_coexist *btcoexist, u8 type);

void ex_halbtc8192e2ant_connect_notify(struct btc_coexist *btcoexist, u8 type);

void ex_halbtc8192e2ant_media_status_notify(struct btc_coexist *btcoexist,

void ex_btc8192e2ant_init_hwconfig(struct btc_coexist *btcoexist);

void ex_btc8192e2ant_init_coex_dm(struct btc_coexist *btcoexist);

void ex_btc8192e2ant_ips_notify(struct btc_coexist *btcoexist, u8 type);

void ex_btc8192e2ant_lps_notify(struct btc_coexist *btcoexist, u8 type);

void ex_btc8192e2ant_scan_notify(struct btc_coexist *btcoexist, u8 type);

void ex_btc8192e2ant_connect_notify(struct btc_coexist *btcoexist, u8 type);

void ex_btc8192e2ant_media_status_notify(struct btc_coexist *btcoexist,

					 u8 type);

void ex_halbtc8192e2ant_special_packet_notify(struct btc_coexist *btcoexist,

void ex_btc8192e2ant_special_packet_notify(struct btc_coexist *btcoexist,

					   u8 type);

void ex_halbtc8192e2ant_bt_info_notify(struct btc_coexist *btcoexist,

void ex_btc8192e2ant_bt_info_notify(struct btc_coexist *btcoexist,

				    u8 *tmpbuf, u8 length);

void ex_halbtc8192e2ant_stack_operation_notify(struct btc_coexist *btcoexist,

void ex_btc8192e2ant_stack_operation_notify(struct btc_coexist *btcoexist,

					    u8 type);

void ex_halbtc8192e2ant_halt_notify(struct btc_coexist *btcoexist);

void ex_halbtc8192e2ant_periodical(struct btc_coexist *btcoexist);

void ex_halbtc8192e2ant_display_coex_info(struct btc_coexist *btcoexist);
 
void ex_btc8192e2ant_halt_notify(struct btc_coexist *btcoexist);

void ex_btc8192e2ant_periodical(struct btc_coexist *btcoexist);

void ex_btc8192e2ant_display_coex_info(struct btc_coexist *btcoexist);

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

+26 −26
Original line number Diff line number Diff line
@@ -2390,9 +2390,9 @@ static void halbtc8723b1ant_init_hw_config(struct btc_coexist *btcoexist, 
}



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

 * extern function start with ex_halbtc8723b1ant_

 * extern function start with ex_btc8723b1ant_

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

void ex_halbtc8723b1ant_power_on_setting(struct btc_coexist *btcoexist)

void ex_btc8723b1ant_power_on_setting(struct btc_coexist *btcoexist)

{

	struct rtl_priv *rtlpriv = btcoexist->adapter;

	struct btc_board_info *board_info = &btcoexist->board_info;
@@ -2462,14 +2462,14 @@ void ex_halbtc8723b1ant_power_on_setting(struct btc_coexist *btcoexist) 
}





void ex_halbtc8723b1ant_init_hwconfig(struct btc_coexist *btcoexist,

void ex_btc8723b1ant_init_hwconfig(struct btc_coexist *btcoexist,

				   bool wifi_only)

{

	halbtc8723b1ant_init_hw_config(btcoexist, true, wifi_only);

	btcoexist->stop_coex_dm = false;

}



void ex_halbtc8723b1ant_init_coex_dm(struct btc_coexist *btcoexist)

void ex_btc8723b1ant_init_coex_dm(struct btc_coexist *btcoexist)

{

	struct rtl_priv *rtlpriv = btcoexist->adapter;
@@ -2483,7 +2483,7 @@ void ex_halbtc8723b1ant_init_coex_dm(struct btc_coexist *btcoexist) 
	halbtc8723b1ant_query_bt_info(btcoexist);

}



void ex_halbtc8723b1ant_display_coex_info(struct btc_coexist *btcoexist)

void ex_btc8723b1ant_display_coex_info(struct btc_coexist *btcoexist)

{

	struct btc_board_info *board_info = &btcoexist->board_info;

	struct btc_stack_info *stack_info = &btcoexist->stack_info;
@@ -2758,7 +2758,7 @@ void ex_halbtc8723b1ant_display_coex_info(struct btc_coexist *btcoexist) 
	btcoexist->btc_disp_dbg_msg(btcoexist, BTC_DBG_DISP_COEX_STATISTICS);

}



void ex_halbtc8723b1ant_ips_notify(struct btc_coexist *btcoexist, u8 type)

void ex_btc8723b1ant_ips_notify(struct btc_coexist *btcoexist, u8 type)

{

	struct rtl_priv *rtlpriv = btcoexist->adapter;
@@ -2787,7 +2787,7 @@ void ex_halbtc8723b1ant_ips_notify(struct btc_coexist *btcoexist, u8 type) 
	}

}



void ex_halbtc8723b1ant_lps_notify(struct btc_coexist *btcoexist, u8 type)

void ex_btc8723b1ant_lps_notify(struct btc_coexist *btcoexist, u8 type)

{

	struct rtl_priv *rtlpriv = btcoexist->adapter;
@@ -2805,7 +2805,7 @@ void ex_halbtc8723b1ant_lps_notify(struct btc_coexist *btcoexist, u8 type) 
	}

}



void ex_halbtc8723b1ant_scan_notify(struct btc_coexist *btcoexist, u8 type)

void ex_btc8723b1ant_scan_notify(struct btc_coexist *btcoexist, u8 type)

{

	struct rtl_priv *rtlpriv = btcoexist->adapter;

	bool wifi_connected = false, bt_hs_on = false;
@@ -2891,7 +2891,7 @@ void ex_halbtc8723b1ant_scan_notify(struct btc_coexist *btcoexist, u8 type) 
	}

}



void ex_halbtc8723b1ant_connect_notify(struct btc_coexist *btcoexist, u8 type)

void ex_btc8723b1ant_connect_notify(struct btc_coexist *btcoexist, u8 type)

{

	struct rtl_priv *rtlpriv = btcoexist->adapter;

	bool wifi_connected = false, bt_hs_on = false;
@@ -2961,7 +2961,7 @@ void ex_halbtc8723b1ant_connect_notify(struct btc_coexist *btcoexist, u8 type) 
	}

}



void ex_halbtc8723b1ant_media_status_notify(struct btc_coexist *btcoexist,

void ex_btc8723b1ant_media_status_notify(struct btc_coexist *btcoexist,

					 u8 type)

{

	struct rtl_priv *rtlpriv = btcoexist->adapter;
@@ -3042,7 +3042,7 @@ void ex_halbtc8723b1ant_media_status_notify(struct btc_coexist *btcoexist, 
	btcoexist->btc_fill_h2c(btcoexist, 0x66, 3, h2c_parameter);

}



void ex_halbtc8723b1ant_special_packet_notify(struct btc_coexist *btcoexist,

void ex_btc8723b1ant_special_packet_notify(struct btc_coexist *btcoexist,

					   u8 type)

{

	struct rtl_priv *rtlpriv = btcoexist->adapter;
@@ -3119,7 +3119,7 @@ void ex_halbtc8723b1ant_special_packet_notify(struct btc_coexist *btcoexist, 
	}

}



void ex_halbtc8723b1ant_bt_info_notify(struct btc_coexist *btcoexist,

void ex_btc8723b1ant_bt_info_notify(struct btc_coexist *btcoexist,

				    u8 *tmp_buf, u8 length)

{

	struct rtl_priv *rtlpriv = btcoexist->adapter;
@@ -3211,10 +3211,10 @@ void ex_halbtc8723b1ant_bt_info_notify(struct btc_coexist *btcoexist, 
			btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_CONNECTED,

					   &wifi_connected);

			if (wifi_connected)

				ex_halbtc8723b1ant_media_status_notify(btcoexist,

				ex_btc8723b1ant_media_status_notify(btcoexist,

						BTC_MEDIA_CONNECT);

			else

				ex_halbtc8723b1ant_media_status_notify(btcoexist,

				ex_btc8723b1ant_media_status_notify(btcoexist,

						BTC_MEDIA_DISCONNECT);

		}
@@ -3364,7 +3364,7 @@ void ex_halbtc8723b1ant_bt_info_notify(struct btc_coexist *btcoexist, 
	halbtc8723b1ant_run_coexist_mechanism(btcoexist);

}



void ex_halbtc8723b1ant_rf_status_notify(struct btc_coexist *btcoexist, u8 type)

void ex_btc8723b1ant_rf_status_notify(struct btc_coexist *btcoexist, u8 type)

{

	struct rtl_priv *rtlpriv = btcoexist->adapter;

	u32 u32tmp;
@@ -3401,7 +3401,7 @@ void ex_halbtc8723b1ant_rf_status_notify(struct btc_coexist *btcoexist, u8 type) 
	}

}



void ex_halbtc8723b1ant_halt_notify(struct btc_coexist *btcoexist)

void ex_btc8723b1ant_halt_notify(struct btc_coexist *btcoexist)

{

	struct rtl_priv *rtlpriv = btcoexist->adapter;
@@ -3418,12 +3418,12 @@ void ex_halbtc8723b1ant_halt_notify(struct btc_coexist *btcoexist) 
					 0x0, 0x0);

	halbtc8723b1ant_ps_tdma(btcoexist, FORCE_EXEC, false, 0);



	ex_halbtc8723b1ant_media_status_notify(btcoexist, BTC_MEDIA_DISCONNECT);

	ex_btc8723b1ant_media_status_notify(btcoexist, BTC_MEDIA_DISCONNECT);



	btcoexist->stop_coex_dm = true;

}



void ex_halbtc8723b1ant_pnp_notify(struct btc_coexist *btcoexist, u8 pnp_state)

void ex_btc8723b1ant_pnp_notify(struct btc_coexist *btcoexist, u8 pnp_state)

{

	struct rtl_priv *rtlpriv = btcoexist->adapter;
@@ -3458,7 +3458,7 @@ void ex_halbtc8723b1ant_pnp_notify(struct btc_coexist *btcoexist, u8 pnp_state) 
	}

}



void ex_halbtc8723b1ant_coex_dm_reset(struct btc_coexist *btcoexist)

void ex_btc8723b1ant_coex_dm_reset(struct btc_coexist *btcoexist)

{

	struct rtl_priv *rtlpriv = btcoexist->adapter;
@@ -3469,7 +3469,7 @@ void ex_halbtc8723b1ant_coex_dm_reset(struct btc_coexist *btcoexist) 
	halbtc8723b1ant_init_coex_dm(btcoexist);

}



void ex_halbtc8723b1ant_periodical(struct btc_coexist *btcoexist)

void ex_btc8723b1ant_periodical(struct btc_coexist *btcoexist)

{

	struct rtl_priv *rtlpriv = btcoexist->adapter;

	struct btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info;

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

+21 −20
Original line number Diff line number Diff line
@@ -200,24 +200,25 @@ struct coex_sta_8723b_1ant { 
/*************************************************************************

 * The following is interface which will notify coex module.

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

void ex_halbtc8723b1ant_power_on_setting(struct btc_coexist *btcoexist);

void ex_halbtc8723b1ant_init_hwconfig(struct btc_coexist *btcoexist,

void ex_btc8723b1ant_power_on_setting(struct btc_coexist *btcoexist);

void ex_btc8723b1ant_init_hwconfig(struct btc_coexist *btcoexist,

				   bool wifi_only);

void ex_halbtc8723b1ant_init_coex_dm(struct btc_coexist *btcoexist);

void ex_halbtc8723b1ant_ips_notify(struct btc_coexist *btcoexist, u8 type);

void ex_halbtc8723b1ant_lps_notify(struct btc_coexist *btcoexist, u8 type);

void ex_halbtc8723b1ant_scan_notify(struct btc_coexist *btcoexist, u8 type);

void ex_halbtc8723b1ant_connect_notify(struct btc_coexist *btcoexist, u8 type);

void ex_halbtc8723b1ant_media_status_notify(struct btc_coexist *btcoexist,

void ex_btc8723b1ant_init_coex_dm(struct btc_coexist *btcoexist);

void ex_btc8723b1ant_ips_notify(struct btc_coexist *btcoexist, u8 type);

void ex_btc8723b1ant_lps_notify(struct btc_coexist *btcoexist, u8 type);

void ex_btc8723b1ant_scan_notify(struct btc_coexist *btcoexist, u8 type);

void ex_btc8723b1ant_connect_notify(struct btc_coexist *btcoexist, u8 type);

void ex_btc8723b1ant_media_status_notify(struct btc_coexist *btcoexist,

					 u8 type);

void ex_halbtc8723b1ant_special_packet_notify(struct btc_coexist *btcoexist,

void ex_btc8723b1ant_special_packet_notify(struct btc_coexist *btcoexist,

					   u8 type);

void ex_halbtc8723b1ant_bt_info_notify(struct btc_coexist *btcoexist,

void ex_btc8723b1ant_bt_info_notify(struct btc_coexist *btcoexist,

				    u8 *tmpbuf, u8 length);

void ex_halbtc8723b1ant_rf_status_notify(struct btc_coexist *btcoexist,

void ex_btc8723b1ant_rf_status_notify(struct btc_coexist *btcoexist,

				      u8 type);

void ex_halbtc8723b1ant_halt_notify(struct btc_coexist *btcoexist);

void ex_halbtc8723b1ant_pnp_notify(struct btc_coexist *btcoexist, u8 pnpstate);

void ex_halbtc8723b1ant_coex_dm_reset(struct btc_coexist *btcoexist);

void ex_halbtc8723b1ant_periodical(struct btc_coexist *btcoexist);

void ex_halbtc8723b1ant_display_coex_info(struct btc_coexist *btcoexist);
 
void ex_btc8723b1ant_halt_notify(struct btc_coexist *btcoexist);

void ex_btc8723b1ant_pnp_notify(struct btc_coexist *btcoexist, u8 pnpstate);

void ex_btc8723b1ant_coex_dm_reset(struct btc_coexist *btcoexist);

void ex_btc8723b1ant_periodical(struct btc_coexist *btcoexist);

void ex_btc8723b1ant_display_coex_info(struct btc_coexist *btcoexist);

void ex_btc8723b1ant_pnp_notify(struct btc_coexist *btcoexist, u8 pnp_state);

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

+20 −18
Original line number Diff line number Diff line
@@ -170,21 +170,23 @@ struct coex_sta_8821a_1ant { 
 * The following is interface which will notify coex module.

 *===========================================

 */

void ex_halbtc8821a1ant_init_hwconfig(struct btc_coexist *btcoexist);

void ex_halbtc8821a1ant_init_coex_dm(struct btc_coexist *btcoexist);

void ex_halbtc8821a1ant_ips_notify(struct btc_coexist *btcoexist, u8 type);

void ex_halbtc8821a1ant_lps_notify(struct btc_coexist *btcoexist, u8 type);

void ex_halbtc8821a1ant_scan_notify(struct btc_coexist *btcoexist, u8 type);

void ex_halbtc8821a1ant_connect_notify(struct btc_coexist *btcoexist, u8 type);

void ex_halbtc8821a1ant_media_status_notify(struct btc_coexist *btcoexist,

void ex_btc8821a1ant_init_hwconfig(struct btc_coexist *btcoexist,

				   bool wifi_only);

void ex_btc8821a1ant_init_coex_dm(struct btc_coexist *btcoexist);

void ex_btc8821a1ant_ips_notify(struct btc_coexist *btcoexist, u8 type);

void ex_btc8821a1ant_lps_notify(struct btc_coexist *btcoexist, u8 type);

void ex_btc8821a1ant_scan_notify(struct btc_coexist *btcoexist, u8 type);

void ex_btc8821a1ant_connect_notify(struct btc_coexist *btcoexist, u8 type);

void ex_btc8821a1ant_media_status_notify(struct btc_coexist *btcoexist,

					 u8 type);

void ex_halbtc8821a1ant_special_packet_notify(struct btc_coexist *btcoexist,

void ex_btc8821a1ant_special_packet_notify(struct btc_coexist *btcoexist,

					   u8 type);

void ex_halbtc8821a1ant_bt_info_notify(struct btc_coexist *btcoexist,

void ex_btc8821a1ant_bt_info_notify(struct btc_coexist *btcoexist,

				    u8 *tmpbuf, u8 length);

void ex_halbtc8821a1ant_halt_notify(struct btc_coexist *btcoexist);

void ex_halbtc8821a1ant_pnp_notify(struct btc_coexist *btcoexist, u8 pnpstate);

void ex_halbtc8821a1ant_periodical(struct btc_coexist *btcoexist);

void ex_halbtc8821a1ant_display_coex_info(struct btc_coexist *btcoexist);

void ex_halbtc8821a1ant_dbg_control(struct btc_coexist *btcoexist, u8 op_code,

void ex_btc8821a1ant_halt_notify(struct btc_coexist *btcoexist);

void ex_btc8821a1ant_pnp_notify(struct btc_coexist *btcoexist, u8 pnpstate);

void ex_btc8821a1ant_periodical(struct btc_coexist *btcoexist);

void ex_btc8821a1ant_display_coex_info(struct btc_coexist *btcoexist);

void ex_btc8821a1ant_dbg_control(struct btc_coexist *btcoexist, u8 op_code,

				 u8 op_len, u8 *data);

void ex_btc8821a1ant_pnp_notify(struct btc_coexist *btcoexist, u8 pnp_state);

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

+12 −12
Original line number Diff line number Diff line
@@ -173,58 +173,58 @@ struct coex_sta_8821a_2ant { 
 *===========================================

 */

void

ex_halbtc8821a2ant_init_hwconfig(

ex_btc8821a2ant_init_hwconfig(

	struct btc_coexist *btcoexist

	);

void

ex_halbtc8821a2ant_init_coex_dm(

ex_btc8821a2ant_init_coex_dm(

	struct btc_coexist *btcoexist

	);

void

ex_halbtc8821a2ant_ips_notify(

ex_btc8821a2ant_ips_notify(

	struct btc_coexist *btcoexist,

	u8 type

	);

void

ex_halbtc8821a2ant_lps_notify(

ex_btc8821a2ant_lps_notify(

	struct btc_coexist *btcoexist,

	u8 type

	);

void

ex_halbtc8821a2ant_scan_notify(

ex_btc8821a2ant_scan_notify(

	struct btc_coexist *btcoexist,

	u8 type

	);

void

ex_halbtc8821a2ant_connect_notify(

ex_btc8821a2ant_connect_notify(

	struct btc_coexist *btcoexist,

	u8 type

	);

void

ex_halbtc8821a2ant_media_status_notify(

ex_btc8821a2ant_media_status_notify(

	struct btc_coexist *btcoexist,

	u8 type

	);

void

ex_halbtc8821a2ant_special_packet_notify(

ex_btc8821a2ant_special_packet_notify(

	struct btc_coexist *btcoexist,

	u8 type

	);

void

ex_halbtc8821a2ant_bt_info_notify(

ex_btc8821a2ant_bt_info_notify(

	struct btc_coexist *btcoexist,

	u8 *tmp_buf,

	u8 length

	);

void

ex_halbtc8821a2ant_halt_notify(

ex_btc8821a2ant_halt_notify(

	struct btc_coexist *btcoexist

	);

void

ex_halbtc8821a2ant_periodical(

ex_btc8821a2ant_periodical(

	struct btc_coexist *btcoexist

	);

void

ex_halbtc8821a2ant_display_coex_info(

ex_btc8821a2ant_display_coex_info(

	struct btc_coexist *btcoexist

	);