qcacmn: Cleanup rssi and snr used interchangeably

Cleanup rssi and snr used interchangeably

Change-Id: Idc78ca1ceb62af766aaf69e42ab5d6e8990a6f0b
This commit is contained in:
Shwetha G K
2021-01-06 15:28:10 +05:30
committed by snandini
parent 7475f6c62c
commit b3fafa78c8
7 changed files with 48 additions and 44 deletions

View File

@@ -120,18 +120,18 @@
#define CDP_FC_IS_RETRY_SET(_fc) \
((_fc) & qdf_cpu_to_le16(CDP_FCTL_RETRY))
#define INVALID_RSSI 255
#define CDP_INVALID_SNR 255
#define CDP_RSSI_MULTIPLIER BIT(8)
#define CDP_RSSI_MUL(x, mul) ((x) * (mul))
#define CDP_RSSI_RND(x, mul) ((((x) % (mul)) >= ((mul) / 2)) ?\
#define CDP_SNR_MULTIPLIER BIT(8)
#define CDP_SNR_MUL(x, mul) ((x) * (mul))
#define CDP_SNR_RND(x, mul) ((((x) % (mul)) >= ((mul) / 2)) ?\
((x) + ((mul) - 1)) / (mul) : (x) / (mul))
#define CDP_RSSI_OUT(x) (CDP_RSSI_RND((x), CDP_RSSI_MULTIPLIER))
#define CDP_RSSI_IN(x) (CDP_RSSI_MUL((x), CDP_RSSI_MULTIPLIER))
#define CDP_RSSI_AVG(x, y) ((((x) << 2) + (y) - (x)) >> 2)
#define CDP_SNR_OUT(x) (CDP_SNR_RND((x), CDP_SNR_MULTIPLIER))
#define CDP_SNR_IN(x) (CDP_SNR_MUL((x), CDP_SNR_MULTIPLIER))
#define CDP_SNR_AVG(x, y) ((((x) << 2) + (y) - (x)) >> 2)
#define CDP_RSSI_UPDATE_AVG(x, y) x = CDP_RSSI_AVG((x), CDP_RSSI_IN((y)))
#define CDP_SNR_UPDATE_AVG(x, y) x = CDP_SNR_AVG((x), CDP_SNR_IN((y)))
/*Max SU EVM count */
#define DP_RX_MAX_SU_EVM_COUNT 32
@@ -803,7 +803,7 @@ enum cdp_peer_stats_type {
cdp_peer_rx_ratecode,
cdp_peer_rx_ucast,
cdp_peer_rx_flags,
cdp_peer_rx_avg_rssi,
cdp_peer_rx_avg_snr,
cdp_peer_stats_max,
};
@@ -829,7 +829,7 @@ typedef union cdp_peer_stats_buf {
uint32_t last_rx_rate;
uint32_t rx_ratecode;
uint32_t rx_flags;
uint32_t rx_avg_rssi;
uint32_t rx_avg_snr;
} cdp_peer_stats_param_t; /* Max union size 16 bytes */
/**
@@ -1063,7 +1063,7 @@ struct cdp_tx_stats {
* @non_amsdu_cnt: Number of MSDUs with no MSDU level aggregation
* @amsdu_cnt: Number of MSDUs part of AMSDU
* @bar_recv_cnt: Number of bar received
* @avg_rssi: Average rssi
* @avg_snr: Average snr
* @rx_rate: Rx rate
* @last_rx_rate: Previous rx rate
* @rnd_avg_rx_rate: Rounded average rx rate
@@ -1087,9 +1087,9 @@ struct cdp_tx_stats {
* @rx_discard: packets discard in rx
* @rx_ratecode: Rx rate code of last frame
* @rx_flags: rx flags
* @rx_rssi_measured_time: Time at which rssi is measured
* @rssi: RSSI of received signal
* @last_rssi: Previous rssi
* @rx_snr_measured_time: Time at which snr is measured
* @snr: SNR of received signal
* @last_snr: Previous snr
* @multipass_rx_pkt_drop: Dropped multipass rx pkt
* @rx_mpdu_cnt: rx mpdu count per MCS rate
* @to_stack_twt: Total packets sent up the stack in TWT session
@@ -1135,7 +1135,7 @@ struct cdp_rx_stats {
uint32_t non_amsdu_cnt;
uint32_t amsdu_cnt;
uint32_t bar_recv_cnt;
uint32_t avg_rssi;
uint32_t avg_snr;
uint32_t rx_rate;
uint32_t last_rx_rate;
uint32_t rnd_avg_rx_rate;
@@ -1156,9 +1156,9 @@ struct cdp_rx_stats {
uint32_t rx_discard;
uint32_t rx_ratecode;
uint32_t rx_flags;
uint32_t rx_rssi_measured_time;
uint8_t rssi;
uint8_t last_rssi;
uint32_t rx_snr_measured_time;
uint8_t snr;
uint8_t last_snr;
uint32_t multipass_rx_pkt_drop;
uint32_t rx_mpdu_cnt[MAX_MCS];
struct cdp_pkt_info to_stack_twt;