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

Commit ed0fb7eb authored by Larry Finger's avatar Larry Finger Committed by Kalle Valo
Browse files

rtlwifi: Move macro definitions to core 



Several of the drivers still were defining their own copies of various
macros. These are all moved into the core.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 9259ee79

drivers/net/wireless/rtlwifi/core.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 


#define DM_DIG_MAX			0x3e

#define DM_DIG_MIN			0x1e

#define DM_DIG_MAX_AP			0x32

#define DM_DIG_BACKOFF_MAX		12

#define DM_DIG_BACKOFF_MIN		-4

#define DM_DIG_BACKOFF_DEFAULT		10

drivers/net/wireless/rtlwifi/rtl8188ee/dm.h

+0 −3
Original line number Diff line number Diff line
@@ -186,9 +186,6 @@ 
#define BW_AUTO_SWITCH_HIGH_LOW				25

#define BW_AUTO_SWITCH_LOW_HIGH				30



#define DM_DIG_MAX_AP					0x32

#define DM_DIG_MIN_AP					0x20



#define DM_DIG_FA_UPPER					0x3e

#define DM_DIG_FA_LOWER					0x1e

#define DM_DIG_FA_TH0					0x200

drivers/net/wireless/rtlwifi/rtl8192ee/dm.h

+0 −3
Original line number Diff line number Diff line
@@ -189,9 +189,6 @@ 
#define BW_AUTO_SWITCH_HIGH_LOW			25

#define BW_AUTO_SWITCH_LOW_HIGH			30



#define DM_DIG_MAX_AP				0x32

#define DM_DIG_MIN_AP				0x20



#define DM_DIG_FA_UPPER				0x3e

#define DM_DIG_FA_LOWER				0x1e

#define DM_DIG_FA_TH0				0x200

drivers/net/wireless/rtlwifi/rtl8192se/dm.c

+3 −3
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ static void _rtl92s_dm_initial_gain_sta_beforeconnect(struct ieee80211_hw *hw) 
			if (digtable->backoff_enable_flag)

				rtl92s_backoff_enable_flag(hw);

			else

				digtable->back_val = DM_DIG_BACKOFF;

				digtable->back_val = DM_DIG_BACKOFF_MAX;



			if ((digtable->rssi_val + 10 - digtable->back_val) >

				digtable->rx_gain_max)
@@ -504,7 +504,7 @@ static void _rtl92s_dm_initial_gain_sta_beforeconnect(struct ieee80211_hw *hw) 
		digtable->dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX;

		rtl92s_phy_set_fw_cmd(hw, FW_CMD_DIG_ENABLE);



		digtable->back_val = DM_DIG_BACKOFF;

		digtable->back_val = DM_DIG_BACKOFF_MAX;

		digtable->cur_igvalue = rtlpriv->phy.default_initialgain[0];

		digtable->pre_igvalue = 0;

		return;
@@ -692,7 +692,7 @@ static void _rtl92s_dm_init_dig(struct ieee80211_hw *hw) 


	/* for dig debug rssi value */

	digtable->rssi_val = 50;

	digtable->back_val = DM_DIG_BACKOFF;

	digtable->back_val = DM_DIG_BACKOFF_MAX;

	digtable->rx_gain_max = DM_DIG_MAX;



	digtable->rx_gain_min = DM_DIG_MIN;

drivers/net/wireless/rtlwifi/rtl8192se/dm.h

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ enum dm_ratr_sta { 


#define	DM_DIG_HIGH_PWR_THRESH_HIGH	75

#define	DM_DIG_HIGH_PWR_THRESH_LOW	70

#define	DM_DIG_BACKOFF			12

#define	DM_DIG_MIN_Netcore		0x12



void rtl92s_dm_watchdog(struct ieee80211_hw *hw);