Message ID | 4bd6e7758bc0d88b33cdb09448633bb5b97aba7c.1541238842.git-series.plaes@plaes.org (mailing list archive) |
---|---|
State | Changes Requested |
Delegated to: | Kalle Valo |
Headers | show |
Series | Use common cordic algorithm for b43 | expand |
Priit Laes <plaes@plaes.org> writes: > Now that cordic library has the CORDIC_FLOAT macro, use that > > Signed-off-by: Priit Laes <plaes@plaes.org> > --- > drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 4 ++-- > drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c | 4 ++-- The driver is "brcmsmac" (note the 's', not 'f'), you should fix the title accordingly. > --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c > @@ -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); I haven't seen the patch 1 yet, but just from seeing this patch I don't get what's the benefit.
On 11/5/2018 10:05 AM, Kalle Valo wrote: > Priit Laes <plaes@plaes.org> writes: > >> Now that cordic library has the CORDIC_FLOAT macro, use that >> >> Signed-off-by: Priit Laes <plaes@plaes.org> >> --- >> drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 4 ++-- >> drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c | 4 ++-- > > The driver is "brcmsmac" (note the 's', not 'f'), you should fix the > title accordingly. > >> --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c >> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c >> @@ -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); > > I haven't seen the patch 1 yet, but just from seeing this patch I don't > get what's the benefit. The FLOAT macro was defined in brcmsmac (see patch 3). It is now moved to the cordic library simply because it is more closely related to that. Regards, Arend
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c index 9fb0d9f..e78a93a 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c @@ -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; } diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c index a57f271..f4f5e90 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c @@ -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);
Now that cordic library has the CORDIC_FLOAT macro, use that Signed-off-by: Priit Laes <plaes@plaes.org> --- drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 4 ++-- drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)