Suddenly it will not compile after this patch CC [M] drivers/net/wireless/ath/ath9k/common-spectral.o /home/lex/tmp/linux/drivers/net/wireless/ath/ath9k/common-spectral.c: In function ‘ath_debug_send_fft_sample’: /home/lex/tmp/linux/drivers/net/wireless/ath/ath9k/common-spectral.c:35:2: error: implicit declaration of function ‘relay_write’ [-Werror=implicit-function-declaration] relay_write(sc->rfs_chan_spec_scan, fft_sample_tlv, length); ^ cc1: some warnings being treated as errors make[3]: *** [drivers/net/wireless/ath/ath9k/common-spectral.o] Fehler 1 make[2]: *** [_module_drivers/net/wireless/ath/ath9k] Fehler 2 make[1]: *** [sub-make] Fehler 2 make: *** [all] Fehler 2
Am 21.04.2014 03:08, schrieb Ashish Patro:
> Signed-off-by: Ashish Patro <pa...@cs.wisc.edu>
> ---
> drivers/net/wireless/ath/ath9k/Makefile | 1 +
> drivers/net/wireless/ath/ath9k/common-spectral.c | 205
> ++++++++++++++++++++++
> drivers/net/wireless/ath/ath9k/spectral.c | 187 --------------------
> 3 files changed, 206 insertions(+), 187 deletions(-)
> create mode 100644 drivers/net/wireless/ath/ath9k/common-spectral.c
>
> diff --git a/drivers/net/wireless/ath/ath9k/Makefile
> b/drivers/net/wireless/ath/ath9k/Makefile
> index 8e1c7b0..613bf30 100644
> --- a/drivers/net/wireless/ath/ath9k/Makefile
> +++ b/drivers/net/wireless/ath/ath9k/Makefile
> @@ -53,6 +53,7 @@ obj-$(CONFIG_ATH9K_HW) += ath9k_hw.o
> obj-$(CONFIG_ATH9K_COMMON) += ath9k_common.o
> ath9k_common-y:= common.o \
> common-init.o \
> + common-spectral.o \
> common-beacon.o
>
> ath9k_htc-y += htc_hst.o \
> diff --git a/drivers/net/wireless/ath/ath9k/common-spectral.c
> b/drivers/net/wireless/ath/ath9k/common-spectral.c
> new file mode 100644
> index 0000000..50f8192
> --- /dev/null
> +++ b/drivers/net/wireless/ath/ath9k/common-spectral.c
> @@ -0,0 +1,205 @@
> +/*
> + * Copyright (c) 2013 Qualcomm Atheros, Inc.
> + *
> + * Permission to use, copy, modify, and/or distribute this software for any
> + * purpose with or without fee is hereby granted, provided that the above
> + * copyright notice and this permission notice appear in all copies.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
> + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
> + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
> + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
> + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
> + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
> + */
> +
> +#include "ath9k.h"
> +
> +static s8 fix_rssi_inv_only(u8 rssi_val)
> +{
> + if (rssi_val == 128)
> + rssi_val = 0;
> + return (s8) rssi_val;
> +}
> +
> +static void ath_debug_send_fft_sample(struct ath_softc *sc,
> + struct fft_sample_tlv *fft_sample_tlv)
> +{
> + int length;
> + if (!sc->rfs_chan_spec_scan)
> + return;
> +
> + length = __be16_to_cpu(fft_sample_tlv->length) +
> + sizeof(*fft_sample_tlv);
> + relay_write(sc->rfs_chan_spec_scan, fft_sample_tlv, length);
> +}
> +
> +/* returns 1 if this was a spectral frame, even if not handled. */
> +int ath_process_fft(struct ath_softc *sc, struct ieee80211_hdr *hdr,
> + struct ath_rx_status *rs, u64 tsf)
> +{
> + struct ath_hw *ah = sc->sc_ah;
> + u8 num_bins, *bins, *vdata = (u8 *)hdr;
> + struct fft_sample_ht20 fft_sample_20;
> + struct fft_sample_ht20_40 fft_sample_40;
> + struct fft_sample_tlv *tlv;
> + struct ath_radar_info *radar_info;
> + int len = rs->rs_datalen;
> + int dc_pos;
> + u16 fft_len, length, freq = ah->curchan->chan->center_freq;
> + enum nl80211_channel_type chan_type;
> +
> + /* AR9280 and before report via ATH9K_PHYERR_RADAR, AR93xx and newer
> + * via ATH9K_PHYERR_SPECTRAL. Haven't seen ATH9K_PHYERR_FALSE_RADAR_EXT
> + * yet, but this is supposed to be possible as well.
> + */
> + if (rs->rs_phyerr != ATH9K_PHYERR_RADAR &&
> + rs->rs_phyerr != ATH9K_PHYERR_FALSE_RADAR_EXT &&
> + rs->rs_phyerr != ATH9K_PHYERR_SPECTRAL)
> + return 0;
> +
> + /* check if spectral scan bit is set. This does not have to be checked
> + * if received through a SPECTRAL phy error, but shouldn't hurt.
> + */
> + radar_info = ((struct ath_radar_info *)&vdata[len]) - 1;
> + if (!(radar_info->pulse_bw_info & SPECTRAL_SCAN_BITMASK))
> + return 0;
> +
> + chan_type = cfg80211_get_chandef_type(&sc->hw->conf.chandef);
> + if ((chan_type == NL80211_CHAN_HT40MINUS) ||
> + (chan_type == NL80211_CHAN_HT40PLUS)) {
> + fft_len = SPECTRAL_HT20_40_TOTAL_DATA_LEN;
> + num_bins = SPECTRAL_HT20_40_NUM_BINS;
> + bins = (u8 *)fft_sample_40.data;
> + } else {
> + fft_len = SPECTRAL_HT20_TOTAL_DATA_LEN;
> + num_bins = SPECTRAL_HT20_NUM_BINS;
> + bins = (u8 *)fft_sample_20.data;
> + }
> +
> + /* Variation in the data length is possible and will be fixed later */
> + if ((len > fft_len + 2) || (len < fft_len - 1))
> + return 1;
> +
> + switch (len - fft_len) {
> + case 0:
> + /* length correct, nothing to do. */
> + memcpy(bins, vdata, num_bins);
> + break;
> + case -1:
> + /* first byte missing, duplicate it. */
> + memcpy(&bins[1], vdata, num_bins - 1);
> + bins[0] = vdata[0];
> + break;
> + case 2:
> + /* MAC added 2 extra bytes at bin 30 and 32, remove them. */
> + memcpy(bins, vdata, 30);
> + bins[30] = vdata[31];
> + memcpy(&bins[31], &vdata[33], num_bins - 31);
> + break;
> + case 1:
> + /* MAC added 2 extra bytes AND first byte is missing. */
> + bins[0] = vdata[0];
> + memcpy(&bins[1], vdata, 30);
> + bins[31] = vdata[31];
> + memcpy(&bins[32], &vdata[33], num_bins - 32);
> + break;
> + default:
> + return 1;
> + }
> +
> + /* DC value (value in the middle) is the blind spot of the spectral
> + * sample and invalid, interpolate it.
> + */
> + dc_pos = num_bins / 2;
> + bins[dc_pos] = (bins[dc_pos + 1] + bins[dc_pos - 1]) / 2;
> +
> + if ((chan_type == NL80211_CHAN_HT40MINUS) ||
> + (chan_type == NL80211_CHAN_HT40PLUS)) {
> + s8 lower_rssi, upper_rssi;
> + s16 ext_nf;
> + u8 lower_max_index, upper_max_index;
> + u8 lower_bitmap_w, upper_bitmap_w;
> + u16 lower_mag, upper_mag;
> + struct ath9k_hw_cal_data *caldata = ah->caldata;
> + struct ath_ht20_40_mag_info *mag_info;
> +
> + if (caldata)
> + ext_nf = ath9k_hw_getchan_noise(ah, ah->curchan,
> + caldata->nfCalHist[3].privNF);
> + else
> + ext_nf = ATH_DEFAULT_NOISE_FLOOR;
> +
> + length = sizeof(fft_sample_40) - sizeof(struct fft_sample_tlv);
> + fft_sample_40.tlv.type = ATH_FFT_SAMPLE_HT20_40;
> + fft_sample_40.tlv.length = __cpu_to_be16(length);
> + fft_sample_40.freq = __cpu_to_be16(freq);
> + fft_sample_40.channel_type = chan_type;
> +
> + if (chan_type == NL80211_CHAN_HT40PLUS) {
> + lower_rssi = fix_rssi_inv_only(rs->rs_rssi_ctl[0]);
> + upper_rssi = fix_rssi_inv_only(rs->rs_rssi_ext[0]);
> +
> + fft_sample_40.lower_noise = ah->noise;
> + fft_sample_40.upper_noise = ext_nf;
> + } else {
> + lower_rssi = fix_rssi_inv_only(rs->rs_rssi_ext[0]);
> + upper_rssi = fix_rssi_inv_only(rs->rs_rssi_ctl[0]);
> +
> + fft_sample_40.lower_noise = ext_nf;
> + fft_sample_40.upper_noise = ah->noise;
> + }
> + fft_sample_40.lower_rssi = lower_rssi;
> + fft_sample_40.upper_rssi = upper_rssi;
> +
> + mag_info = ((struct ath_ht20_40_mag_info *)radar_info) - 1;
> + lower_mag = spectral_max_magnitude(mag_info->lower_bins);
> + upper_mag = spectral_max_magnitude(mag_info->upper_bins);
> + fft_sample_40.lower_max_magnitude = __cpu_to_be16(lower_mag);
> + fft_sample_40.upper_max_magnitude = __cpu_to_be16(upper_mag);
> + lower_max_index = spectral_max_index(mag_info->lower_bins);
> + upper_max_index = spectral_max_index(mag_info->upper_bins);
> + fft_sample_40.lower_max_index = lower_max_index;
> + fft_sample_40.upper_max_index = upper_max_index;
> + lower_bitmap_w = spectral_bitmap_weight(mag_info->lower_bins);
> + upper_bitmap_w = spectral_bitmap_weight(mag_info->upper_bins);
> + fft_sample_40.lower_bitmap_weight = lower_bitmap_w;
> + fft_sample_40.upper_bitmap_weight = upper_bitmap_w;
> + fft_sample_40.max_exp = mag_info->max_exp & 0xf;
> +
> + fft_sample_40.tsf = __cpu_to_be64(tsf);
> +
> + tlv = (struct fft_sample_tlv *)&fft_sample_40;
> + } else {
> + u8 max_index, bitmap_w;
> + u16 magnitude;
> + struct ath_ht20_mag_info *mag_info;
> +
> + length = sizeof(fft_sample_20) - sizeof(struct fft_sample_tlv);
> + fft_sample_20.tlv.type = ATH_FFT_SAMPLE_HT20;
> + fft_sample_20.tlv.length = __cpu_to_be16(length);
> + fft_sample_20.freq = __cpu_to_be16(freq);
> +
> + fft_sample_20.rssi = fix_rssi_inv_only(rs->rs_rssi_ctl[0]);
> + fft_sample_20.noise = ah->noise;
> +
> + mag_info = ((struct ath_ht20_mag_info *)radar_info) - 1;
> + magnitude = spectral_max_magnitude(mag_info->all_bins);
> + fft_sample_20.max_magnitude = __cpu_to_be16(magnitude);
> + max_index = spectral_max_index(mag_info->all_bins);
> + fft_sample_20.max_index = max_index;
> + bitmap_w = spectral_bitmap_weight(mag_info->all_bins);
> + fft_sample_20.bitmap_weight = bitmap_w;
> + fft_sample_20.max_exp = mag_info->max_exp & 0xf;
> +
> + fft_sample_20.tsf = __cpu_to_be64(tsf);
> +
> + tlv = (struct fft_sample_tlv *)&fft_sample_20;
> + }
> +
> + ath_debug_send_fft_sample(sc, tlv);
> +
> + return 1;
> +}
> +EXPORT_SYMBOL(ath_process_fft);
> diff --git a/drivers/net/wireless/ath/ath9k/spectral.c
> b/drivers/net/wireless/ath/ath9k/spectral.c
> index 99f4de9..5e1d472 100644
> --- a/drivers/net/wireless/ath/ath9k/spectral.c
> +++ b/drivers/net/wireless/ath/ath9k/spectral.c
> @@ -17,193 +17,6 @@
> #include <linux/relay.h>
> #include "ath9k.h"
>
> -static s8 fix_rssi_inv_only(u8 rssi_val)
> -{
> - if (rssi_val == 128)
> - rssi_val = 0;
> - return (s8) rssi_val;
> -}
> -
> -static void ath_debug_send_fft_sample(struct ath_softc *sc,
> - struct fft_sample_tlv *fft_sample_tlv)
> -{
> - int length;
> - if (!sc->rfs_chan_spec_scan)
> - return;
> -
> - length = __be16_to_cpu(fft_sample_tlv->length) +
> - sizeof(*fft_sample_tlv);
> - relay_write(sc->rfs_chan_spec_scan, fft_sample_tlv, length);
> -}
> -
> -/* returns 1 if this was a spectral frame, even if not handled. */
> -int ath_process_fft(struct ath_softc *sc, struct ieee80211_hdr *hdr,
> - struct ath_rx_status *rs, u64 tsf)
> -{
> - struct ath_hw *ah = sc->sc_ah;
> - u8 num_bins, *bins, *vdata = (u8 *)hdr;
> - struct fft_sample_ht20 fft_sample_20;
> - struct fft_sample_ht20_40 fft_sample_40;
> - struct fft_sample_tlv *tlv;
> - struct ath_radar_info *radar_info;
> - int len = rs->rs_datalen;
> - int dc_pos;
> - u16 fft_len, length, freq = ah->curchan->chan->center_freq;
> - enum nl80211_channel_type chan_type;
> -
> - /* AR9280 and before report via ATH9K_PHYERR_RADAR, AR93xx and newer
> - * via ATH9K_PHYERR_SPECTRAL. Haven't seen ATH9K_PHYERR_FALSE_RADAR_EXT
> - * yet, but this is supposed to be possible as well.
> - */
> - if (rs->rs_phyerr != ATH9K_PHYERR_RADAR &&
> - rs->rs_phyerr != ATH9K_PHYERR_FALSE_RADAR_EXT &&
> - rs->rs_phyerr != ATH9K_PHYERR_SPECTRAL)
> - return 0;
> -
> - /* check if spectral scan bit is set. This does not have to be checked
> - * if received through a SPECTRAL phy error, but shouldn't hurt.
> - */
> - radar_info = ((struct ath_radar_info *)&vdata[len]) - 1;
> - if (!(radar_info->pulse_bw_info & SPECTRAL_SCAN_BITMASK))
> - return 0;
> -
> - chan_type = cfg80211_get_chandef_type(&sc->hw->conf.chandef);
> - if ((chan_type == NL80211_CHAN_HT40MINUS) ||
> - (chan_type == NL80211_CHAN_HT40PLUS)) {
> - fft_len = SPECTRAL_HT20_40_TOTAL_DATA_LEN;
> - num_bins = SPECTRAL_HT20_40_NUM_BINS;
> - bins = (u8 *)fft_sample_40.data;
> - } else {
> - fft_len = SPECTRAL_HT20_TOTAL_DATA_LEN;
> - num_bins = SPECTRAL_HT20_NUM_BINS;
> - bins = (u8 *)fft_sample_20.data;
> - }
> -
> - /* Variation in the data length is possible and will be fixed later */
> - if ((len > fft_len + 2) || (len < fft_len - 1))
> - return 1;
> -
> - switch (len - fft_len) {
> - case 0:
> - /* length correct, nothing to do. */
> - memcpy(bins, vdata, num_bins);
> - break;
> - case -1:
> - /* first byte missing, duplicate it. */
> - memcpy(&bins[1], vdata, num_bins - 1);
> - bins[0] = vdata[0];
> - break;
> - case 2:
> - /* MAC added 2 extra bytes at bin 30 and 32, remove them. */
> - memcpy(bins, vdata, 30);
> - bins[30] = vdata[31];
> - memcpy(&bins[31], &vdata[33], num_bins - 31);
> - break;
> - case 1:
> - /* MAC added 2 extra bytes AND first byte is missing. */
> - bins[0] = vdata[0];
> - memcpy(&bins[1], vdata, 30);
> - bins[31] = vdata[31];
> - memcpy(&bins[32], &vdata[33], num_bins - 32);
> - break;
> - default:
> - return 1;
> - }
> -
> - /* DC value (value in the middle) is the blind spot of the spectral
> - * sample and invalid, interpolate it.
> - */
> - dc_pos = num_bins / 2;
> - bins[dc_pos] = (bins[dc_pos + 1] + bins[dc_pos - 1]) / 2;
> -
> - if ((chan_type == NL80211_CHAN_HT40MINUS) ||
> - (chan_type == NL80211_CHAN_HT40PLUS)) {
> - s8 lower_rssi, upper_rssi;
> - s16 ext_nf;
> - u8 lower_max_index, upper_max_index;
> - u8 lower_bitmap_w, upper_bitmap_w;
> - u16 lower_mag, upper_mag;
> - struct ath9k_hw_cal_data *caldata = ah->caldata;
> - struct ath_ht20_40_mag_info *mag_info;
> -
> - if (caldata)
> - ext_nf = ath9k_hw_getchan_noise(ah, ah->curchan,
> - caldata->nfCalHist[3].privNF);
> - else
> - ext_nf = ATH_DEFAULT_NOISE_FLOOR;
> -
> - length = sizeof(fft_sample_40) - sizeof(struct fft_sample_tlv);
> - fft_sample_40.tlv.type = ATH_FFT_SAMPLE_HT20_40;
> - fft_sample_40.tlv.length = __cpu_to_be16(length);
> - fft_sample_40.freq = __cpu_to_be16(freq);
> - fft_sample_40.channel_type = chan_type;
> -
> - if (chan_type == NL80211_CHAN_HT40PLUS) {
> - lower_rssi = fix_rssi_inv_only(rs->rs_rssi_ctl[0]);
> - upper_rssi = fix_rssi_inv_only(rs->rs_rssi_ext[0]);
> -
> - fft_sample_40.lower_noise = ah->noise;
> - fft_sample_40.upper_noise = ext_nf;
> - } else {
> - lower_rssi = fix_rssi_inv_only(rs->rs_rssi_ext[0]);
> - upper_rssi = fix_rssi_inv_only(rs->rs_rssi_ctl[0]);
> -
> - fft_sample_40.lower_noise = ext_nf;
> - fft_sample_40.upper_noise = ah->noise;
> - }
> - fft_sample_40.lower_rssi = lower_rssi;
> - fft_sample_40.upper_rssi = upper_rssi;
> -
> - mag_info = ((struct ath_ht20_40_mag_info *)radar_info) - 1;
> - lower_mag = spectral_max_magnitude(mag_info->lower_bins);
> - upper_mag = spectral_max_magnitude(mag_info->upper_bins);
> - fft_sample_40.lower_max_magnitude = __cpu_to_be16(lower_mag);
> - fft_sample_40.upper_max_magnitude = __cpu_to_be16(upper_mag);
> - lower_max_index = spectral_max_index(mag_info->lower_bins);
> - upper_max_index = spectral_max_index(mag_info->upper_bins);
> - fft_sample_40.lower_max_index = lower_max_index;
> - fft_sample_40.upper_max_index = upper_max_index;
> - lower_bitmap_w = spectral_bitmap_weight(mag_info->lower_bins);
> - upper_bitmap_w = spectral_bitmap_weight(mag_info->upper_bins);
> - fft_sample_40.lower_bitmap_weight = lower_bitmap_w;
> - fft_sample_40.upper_bitmap_weight = upper_bitmap_w;
> - fft_sample_40.max_exp = mag_info->max_exp & 0xf;
> -
> - fft_sample_40.tsf = __cpu_to_be64(tsf);
> -
> - tlv = (struct fft_sample_tlv *)&fft_sample_40;
> - } else {
> - u8 max_index, bitmap_w;
> - u16 magnitude;
> - struct ath_ht20_mag_info *mag_info;
> -
> - length = sizeof(fft_sample_20) - sizeof(struct fft_sample_tlv);
> - fft_sample_20.tlv.type = ATH_FFT_SAMPLE_HT20;
> - fft_sample_20.tlv.length = __cpu_to_be16(length);
> - fft_sample_20.freq = __cpu_to_be16(freq);
> -
> - fft_sample_20.rssi = fix_rssi_inv_only(rs->rs_rssi_ctl[0]);
> - fft_sample_20.noise = ah->noise;
> -
> - mag_info = ((struct ath_ht20_mag_info *)radar_info) - 1;
> - magnitude = spectral_max_magnitude(mag_info->all_bins);
> - fft_sample_20.max_magnitude = __cpu_to_be16(magnitude);
> - max_index = spectral_max_index(mag_info->all_bins);
> - fft_sample_20.max_index = max_index;
> - bitmap_w = spectral_bitmap_weight(mag_info->all_bins);
> - fft_sample_20.bitmap_weight = bitmap_w;
> - fft_sample_20.max_exp = mag_info->max_exp & 0xf;
> -
> - fft_sample_20.tsf = __cpu_to_be64(tsf);
> -
> - tlv = (struct fft_sample_tlv *)&fft_sample_20;
> - }
> -
> - ath_debug_send_fft_sample(sc, tlv);
> -
> - return 1;
> -}
> -
> /*********************/
> /* spectral_scan_ctl */
> /*********************/
>
--
Regards,
Oleksij
signature.asc
Description: OpenPGP digital signature
_______________________________________________ ath9k-devel mailing list ath9k-devel@lists.ath9k.org https://lists.ath9k.org/mailman/listinfo/ath9k-devel
