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

Commit 0de9b5db authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Kalle Valo
Browse files

rtlwifi: move btcoex's ant_num declaration 



File halbtcoutsrc.c is a better place for routine rtl_get_hwpg_ant_num()
than file rtl_btc.c.

Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent db8cb009

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

+12 −0
Original line number Diff line number Diff line
@@ -151,6 +151,18 @@ u8 rtl_get_hwpg_single_ant_path(struct rtl_priv *rtlpriv) 
	return rtlpriv->btcoexist.btc_info.single_ant_path;

}



u8 rtl_get_hwpg_ant_num(struct rtl_priv *rtlpriv)

{

	u8 num;



	if (rtlpriv->btcoexist.btc_info.ant_num == ANT_X2)

		num = 2;

	else

		num = 1;



	return num;

}



static void halbtc_leave_lps(struct btc_coexist *btcoexist)

{

	struct rtl_priv *rtlpriv;

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

+0 −11
Original line number Diff line number Diff line
@@ -178,17 +178,6 @@ struct rtl_btc_ops *rtl_btc_get_ops_pointer(void) 
}

EXPORT_SYMBOL(rtl_btc_get_ops_pointer);



u8 rtl_get_hwpg_ant_num(struct rtl_priv *rtlpriv)

{

	u8 num;



	if (rtlpriv->btcoexist.btc_info.ant_num == ANT_X2)

		num = 2;

	else

		num = 1;



	return num;

}



enum rt_media_status mgnt_link_status_query(struct ieee80211_hw *hw)

{

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

+1 −1
Original line number Diff line number Diff line
@@ -46,9 +46,9 @@ void rtl_btc_special_packet_notify(struct rtl_priv *rtlpriv, u8 pkt_type); 


struct rtl_btc_ops *rtl_btc_get_ops_pointer(void);



u8 rtl_get_hwpg_ant_num(struct rtl_priv *rtlpriv);

u8 rtl_get_hwpg_bt_exist(struct rtl_priv *rtlpriv);

u8 rtl_get_hwpg_bt_type(struct rtl_priv *rtlpriv);

u8 rtl_get_hwpg_ant_num(struct rtl_priv *rtlpriv);

u8 rtl_get_hwpg_single_ant_path(struct rtl_priv *rtlpriv);

enum rt_media_status mgnt_link_status_query(struct ieee80211_hw *hw);

drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c

+2 −0
Original line number Diff line number Diff line
@@ -2653,6 +2653,8 @@ void rtl8723be_read_bt_coexist_info_from_hwpg(struct ieee80211_hw *hw, 
		value = hwinfo[EEPROM_RF_BT_SETTING_8723B];

		rtlpriv->btcoexist.btc_info.bt_type = BT_RTL8723B;

		rtlpriv->btcoexist.btc_info.ant_num = (value & 0x1);

		rtlpriv->btcoexist.btc_info.single_ant_path =

			 (value & 0x40);	/*0xc3[6]*/

	} else {

		rtlpriv->btcoexist.btc_info.btcoexist = 0;

		rtlpriv->btcoexist.btc_info.bt_type = BT_RTL8723B;