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

Commit ea3edda9 authored by Priit Laes's avatar Priit Laes Committed by Kalle Valo
Browse files

brcmsmac: Use cordic-related macros from common cordic library 



Current driver includes macro that is available from general cordic
library. Use that and drop unused duplicate and unneeded internal
definitions.

Signed-off-by: default avatarPriit Laes <plaes@plaes.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 58d81d64

drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_int.h

+0 −7
Original line number Diff line number Diff line
@@ -220,13 +220,6 @@ enum phy_cal_mode { 
#define BB_MULT_MASK		0x0000ffff

#define BB_MULT_VALID_MASK	0x80000000



#define CORDIC_AG	39797

#define	CORDIC_NI	18

#define	FIXED(X)	((s32)((X) << 16))



#define	FLOAT(X) \

	(((X) >= 0) ? ((((X) >> 15) + 1) >> 1) : -((((-(X)) >> 15) + 1) >> 1))



#define PHY_CHAIN_TX_DISABLE_TEMP	115

#define PHY_HYSTERESIS_DELTATEMP	5

drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c

+2 −2
Original line number Diff line number Diff line
@@ -3447,8 +3447,8 @@ wlc_lcnphy_start_tx_tone(struct brcms_phy *pi, s32 f_kHz, u16 max_val, 


		theta += rot;



		i_samp = (u16) (FLOAT(tone_samp.i * max_val) & 0x3ff);

		q_samp = (u16) (FLOAT(tone_samp.q * max_val) & 0x3ff);

		i_samp = (u16)(CORDIC_FLOAT(tone_samp.i * max_val) & 0x3ff);

		q_samp = (u16)(CORDIC_FLOAT(tone_samp.q * max_val) & 0x3ff);

		data_buf[t] = (i_samp << 10) | q_samp;

	}

drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c

+2 −2
Original line number Diff line number Diff line
@@ -23089,8 +23089,8 @@ wlc_phy_gen_load_samples_nphy(struct brcms_phy *pi, u32 f_kHz, u16 max_val, 














		theta += rot;



























		tone_buf[t].q = (s32) FLOAT(tone_buf[t].q * max_val);













		tone_buf[t].i = (s32) FLOAT(tone_buf[t].i * max_val);













		tone_buf[t].q = (s32)CORDIC_FLOAT(tone_buf[t].q * max_val);













		tone_buf[t].i = (s32)CORDIC_FLOAT(tone_buf[t].i * max_val);















	}





























	wlc_phy_loadsampletable_nphy(pi, tone_buf, num_samps);