From 9ba3c35fdb4022fdfef9ef0569d29b38f653936c Mon Sep 17 00:00:00 2001 From: Shwetha G K Date: Tue, 2 Nov 2021 12:46:28 +0530 Subject: [PATCH] qcacmn: Update chan capture status bitmask Update channel capture status bitmask Change-Id: Id4bb7601ea981da6f48a6e8ae258ae8af51bef13 CRs-Fixed: 3057984 --- hal/wifi3.0/qcn9224/hal_9224.c | 4 +--- hal/wifi3.0/qcn9224/hal_9224_rx.h | 13 +++++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/hal/wifi3.0/qcn9224/hal_9224.c b/hal/wifi3.0/qcn9224/hal_9224.c index c2f94ab3cc..e2d151035a 100644 --- a/hal/wifi3.0/qcn9224/hal_9224.c +++ b/hal/wifi3.0/qcn9224/hal_9224.c @@ -795,9 +795,7 @@ void hal_rx_get_rtt_info_9224(void *rx_tlv, void *ppdu_info_hdl) RTT_CHE_BUFFER_POINTER_HIGH8); ppdu_info->cfr_info.chan_capture_status = - HAL_RX_GET(rx_tlv, - PHYRX_LOCATION_RX_LOCATION_INFO_DETAILS, - RTT_CFR_STATUS); + HAL_GET_RX_LOCATION_INFO_CHAN_CAPTURE_STATUS(rx_tlv); ppdu_info->cfr_info.rx_start_ts = HAL_RX_GET(rx_tlv, diff --git a/hal/wifi3.0/qcn9224/hal_9224_rx.h b/hal/wifi3.0/qcn9224/hal_9224_rx.h index b8d9279089..c07e91ed4b 100644 --- a/hal/wifi3.0/qcn9224/hal_9224_rx.h +++ b/hal/wifi3.0/qcn9224/hal_9224_rx.h @@ -98,7 +98,16 @@ RX_MSDU_DETAILS_RX_MSDU_DESC_INFO_DETAILS_RESERVED_0A_OFFSET)) _OFFSET_TO_BYTE_PTR((link_desc),\ RX_MSDU_LINK_MSDU_0_BUFFER_ADDR_INFO_DETAILS_BUFFER_ADDR_31_0_OFFSET)) -#if defined(QCA_WIFI_WCN9224) && defined(WLAN_CFR_ENABLE) && \ - defined(WLAN_ENH_CFR_ENABLE) +#if defined(WLAN_CFR_ENABLE) && defined(WLAN_ENH_CFR_ENABLE) +#define PHYRX_LOCATION_RX_LOCATION_INFO_DETAILS_CHAN_CAPTURE_STATUS_BMASK 0x00000006 +#define PHYRX_LOCATION_RX_LOCATION_INFO_DETAILS_CHAN_CAPTURE_STATUS_LSB 1 +#define PHYRX_LOCATION_RX_LOCATION_INFO_DETAILS_CHAN_CAPTURE_STATUS_MSB 2 + +#define HAL_GET_RX_LOCATION_INFO_CHAN_CAPTURE_STATUS(rx_tlv) \ + ((HAL_RX_GET((rx_tlv), \ + PHYRX_LOCATION_RX_LOCATION_INFO_DETAILS, \ + RTT_CFR_STATUS) & \ + PHYRX_LOCATION_RX_LOCATION_INFO_DETAILS_CHAN_CAPTURE_STATUS_BMASK) >> \ + PHYRX_LOCATION_RX_LOCATION_INFO_DETAILS_CHAN_CAPTURE_STATUS_LSB) #endif #endif