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

Commit e8f3fef4 authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

rtlwifi: btcoexist: Modify rtl_btc for changes in latest Realtek code 



Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: troy_tan@realsil.com.cn
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e79fff28

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

+17 −4
Original line number Original line Diff line number Diff line
@@ -22,19 +22,19 @@ 
 * Larry Finger <Larry.Finger@lwfinger.net>

 * Larry Finger <Larry.Finger@lwfinger.net>

 *

 *

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

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



#include "../wifi.h"

#include "../wifi.h"

#include "rtl_btc.h"

#include "halbt_precomp.h"



#include <linux/vmalloc.h>

#include <linux/vmalloc.h>

#include <linux/module.h>

#include <linux/module.h>





#include "rtl_btc.h"

#include "halbt_precomp.h"



static struct rtl_btc_ops rtl_btc_operation = {

static struct rtl_btc_ops rtl_btc_operation = {

	.btc_init_variables = rtl_btc_init_variables,

	.btc_init_variables = rtl_btc_init_variables,

	.btc_init_hal_vars = rtl_btc_init_hal_vars,

	.btc_init_hal_vars = rtl_btc_init_hal_vars,

	.btc_init_hw_config = rtl_btc_init_hw_config,

	.btc_init_hw_config = rtl_btc_init_hw_config,

	.btc_ips_notify = rtl_btc_ips_notify,

	.btc_ips_notify = rtl_btc_ips_notify,

	.btc_lps_notify = rtl_btc_lps_notify,

	.btc_scan_notify = rtl_btc_scan_notify,

	.btc_scan_notify = rtl_btc_scan_notify,

	.btc_connect_notify = rtl_btc_connect_notify,

	.btc_connect_notify = rtl_btc_connect_notify,

	.btc_mediastatus_notify = rtl_btc_mediastatus_notify,

	.btc_mediastatus_notify = rtl_btc_mediastatus_notify,
@@ -44,6 +44,7 @@ static struct rtl_btc_ops rtl_btc_operation = { 
	.btc_is_limited_dig = rtl_btc_is_limited_dig,

	.btc_is_limited_dig = rtl_btc_is_limited_dig,

	.btc_is_disable_edca_turbo = rtl_btc_is_disable_edca_turbo,

	.btc_is_disable_edca_turbo = rtl_btc_is_disable_edca_turbo,

	.btc_is_bt_disabled = rtl_btc_is_bt_disabled,

	.btc_is_bt_disabled = rtl_btc_is_bt_disabled,

	.btc_special_packet_notify = rtl_btc_special_packet_notify,

};

};





void rtl_btc_init_variables(struct rtl_priv *rtlpriv)

void rtl_btc_init_variables(struct rtl_priv *rtlpriv)
@@ -85,6 +86,11 @@ void rtl_btc_ips_notify(struct rtl_priv *rtlpriv, u8 type) 
	exhalbtc_ips_notify(&gl_bt_coexist, type);

	exhalbtc_ips_notify(&gl_bt_coexist, type);

}

}





void rtl_btc_lps_notify(struct rtl_priv *rtlpriv, u8 type)

{

	exhalbtc_lps_notify(&gl_bt_coexist, type);

}



void rtl_btc_scan_notify(struct rtl_priv *rtlpriv, u8 scantype)

void rtl_btc_scan_notify(struct rtl_priv *rtlpriv, u8 scantype)

{

{

	exhalbtc_scan_notify(&gl_bt_coexist, scantype);

	exhalbtc_scan_notify(&gl_bt_coexist, scantype);
@@ -103,6 +109,7 @@ void rtl_btc_mediastatus_notify(struct rtl_priv *rtlpriv, 




void rtl_btc_periodical(struct rtl_priv *rtlpriv)

void rtl_btc_periodical(struct rtl_priv *rtlpriv)

{

{

	/*rtl_bt_dm_monitor();*/

	exhalbtc_periodical(&gl_bt_coexist);

	exhalbtc_periodical(&gl_bt_coexist);

}

}
@@ -150,12 +157,18 @@ bool rtl_btc_is_disable_edca_turbo(struct rtl_priv *rtlpriv) 




bool rtl_btc_is_bt_disabled(struct rtl_priv *rtlpriv)

bool rtl_btc_is_bt_disabled(struct rtl_priv *rtlpriv)

{

{

	/* It seems 'bt_disabled' is never be initialized or set. */

	if (gl_bt_coexist.bt_info.bt_disabled)

	if (gl_bt_coexist.bt_info.bt_disabled)

		return true;

		return true;

	else

	else

		return false;

		return false;

}

}





void rtl_btc_special_packet_notify(struct rtl_priv *rtlpriv, u8 pkt_type)

{

	return exhalbtc_special_packet_notify(&gl_bt_coexist, pkt_type);

}



struct rtl_btc_ops *rtl_btc_get_ops_pointer(void)

struct rtl_btc_ops *rtl_btc_get_ops_pointer(void)

{

{

	return &rtl_btc_operation;

	return &rtl_btc_operation;

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ void rtl_btc_init_variables(struct rtl_priv *rtlpriv); 
void rtl_btc_init_hal_vars(struct rtl_priv *rtlpriv);

void rtl_btc_init_hal_vars(struct rtl_priv *rtlpriv);

void rtl_btc_init_hw_config(struct rtl_priv *rtlpriv);

void rtl_btc_init_hw_config(struct rtl_priv *rtlpriv);

void rtl_btc_ips_notify(struct rtl_priv *rtlpriv, u8 type);

void rtl_btc_ips_notify(struct rtl_priv *rtlpriv, u8 type);

void rtl_btc_lps_notify(struct rtl_priv *rtlpriv, u8 type);

void rtl_btc_scan_notify(struct rtl_priv *rtlpriv, u8 scantype);

void rtl_btc_scan_notify(struct rtl_priv *rtlpriv, u8 scantype);

void rtl_btc_connect_notify(struct rtl_priv *rtlpriv, u8 action);

void rtl_btc_connect_notify(struct rtl_priv *rtlpriv, u8 action);

void rtl_btc_mediastatus_notify(struct rtl_priv *rtlpriv,

void rtl_btc_mediastatus_notify(struct rtl_priv *rtlpriv,
@@ -41,6 +42,7 @@ void rtl_btc_btinfo_notify(struct rtl_priv *rtlpriv, u8 *tmpbuf, u8 length); 
bool rtl_btc_is_limited_dig(struct rtl_priv *rtlpriv);

bool rtl_btc_is_limited_dig(struct rtl_priv *rtlpriv);

bool rtl_btc_is_disable_edca_turbo(struct rtl_priv *rtlpriv);

bool rtl_btc_is_disable_edca_turbo(struct rtl_priv *rtlpriv);

bool rtl_btc_is_bt_disabled(struct rtl_priv *rtlpriv);

bool rtl_btc_is_bt_disabled(struct rtl_priv *rtlpriv);

void rtl_btc_special_packet_notify(struct rtl_priv *rtlpriv, u8 pkt_type);





struct rtl_btc_ops *rtl_btc_get_ops_pointer(void);

struct rtl_btc_ops *rtl_btc_get_ops_pointer(void);

drivers/net/wireless/rtlwifi/wifi.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -2312,6 +2312,7 @@ struct rtl_btc_ops { 
	void (*btc_init_hal_vars) (struct rtl_priv *rtlpriv);

	void (*btc_init_hal_vars) (struct rtl_priv *rtlpriv);

	void (*btc_init_hw_config) (struct rtl_priv *rtlpriv);

	void (*btc_init_hw_config) (struct rtl_priv *rtlpriv);

	void (*btc_ips_notify) (struct rtl_priv *rtlpriv, u8 type);

	void (*btc_ips_notify) (struct rtl_priv *rtlpriv, u8 type);

	void (*btc_lps_notify)(struct rtl_priv *rtlpriv, u8 type);

	void (*btc_scan_notify) (struct rtl_priv *rtlpriv, u8 scantype);

	void (*btc_scan_notify) (struct rtl_priv *rtlpriv, u8 scantype);

	void (*btc_connect_notify) (struct rtl_priv *rtlpriv, u8 action);

	void (*btc_connect_notify) (struct rtl_priv *rtlpriv, u8 action);

	void (*btc_mediastatus_notify) (struct rtl_priv *rtlpriv,

	void (*btc_mediastatus_notify) (struct rtl_priv *rtlpriv,
@@ -2323,6 +2324,8 @@ struct rtl_btc_ops { 
	bool (*btc_is_limited_dig) (struct rtl_priv *rtlpriv);

	bool (*btc_is_limited_dig) (struct rtl_priv *rtlpriv);

	bool (*btc_is_disable_edca_turbo) (struct rtl_priv *rtlpriv);

	bool (*btc_is_disable_edca_turbo) (struct rtl_priv *rtlpriv);

	bool (*btc_is_bt_disabled) (struct rtl_priv *rtlpriv);

	bool (*btc_is_bt_disabled) (struct rtl_priv *rtlpriv);

	void (*btc_special_packet_notify)(struct rtl_priv *rtlpriv,

					  u8 pkt_type);

};

};





struct proxim {

struct proxim {