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

Commit aee8b781 authored by Shwetha G K's avatar Shwetha G K Committed by Madan Koyyalamudi
Browse files

qcacmn: Cleanup CFR meta version structures 

Cleanup CFR metadata version structures to avoid redundant
& unused definitions

Change-Id: Ia8b8234a38455f8c976600ef40c0a56c7bf66a53
parent 65714f33

target_if/cfr/src/target_if_cfr_enh.c

+29 −29
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ static void dump_mu_rx_info(void *mu_rx_user_info, 
static void dump_metadata(struct csi_cfr_header *header, uint32_t cookie)

{

	uint8_t user_id, chain_id;

	struct cfr_metadata_version_5 *meta = &header->u.meta_v5;

	struct enh_cfr_metadata *meta = &header->u.meta_enh;

	uint8_t *usermac = NULL;



	cfr_debug("<METADATA><%u>\n"
@@ -718,7 +718,7 @@ void target_if_cfr_rx_tlv_process(struct wlan_objmgr_pdev *pdev, void *nbuf) 
	int i, status = 0;

	QDF_STATUS retval = 0;

	struct wlan_lmac_if_cfr_rx_ops *cfr_rx_ops = NULL;

	struct cfr_metadata_version_5 *meta = NULL;

	struct enh_cfr_metadata *meta = NULL;

	uint8_t srng_id = 0;

	struct wlan_lmac_if_rx_ops *rx_ops;

	uint32_t target_type;
@@ -821,7 +821,7 @@ void target_if_cfr_rx_tlv_process(struct wlan_objmgr_pdev *pdev, void *nbuf) 
	lut->tx_address2 = cfr_info->rtt_che_buffer_pointer_high8;

	lut->txrx_tstamp = qdf_ktime_to_ms(qdf_ktime_get());

	header = &lut->header;

	meta = &header->u.meta_v5;

	meta = &header->u.meta_enh;



	target_if_cfr_fill_header(header, false, target_type, true);
@@ -945,7 +945,7 @@ static bool enh_cfr_dbr_event_handler(struct wlan_objmgr_pdev *pdev, 
	uint8_t capture_type = CFR_TYPE_METHOD_AUTO;

	uint8_t *peer_macaddr = NULL;

	struct wlan_lmac_if_cfr_rx_ops *cfr_rx_ops = NULL;

	struct cfr_metadata_version_5 *meta = NULL;

	struct enh_cfr_metadata *meta = NULL;

	struct wlan_lmac_if_rx_ops *rx_ops;



	if ((!pdev) || (!payload)) {
@@ -1026,7 +1026,7 @@ static bool enh_cfr_dbr_event_handler(struct wlan_objmgr_pdev *pdev, 


	header = &lut->header;

	header->cmn.chip_type = pcfr->chip_type;

	meta = &header->u.meta_v5;

	meta = &header->u.meta_enh;

	meta->channel_bw = dma_hdr.upload_pkt_bw;

	meta->num_rx_chain = NUM_CHAINS_FW_TO_HOST(dma_hdr.num_chains);

	meta->length = length;
@@ -1187,12 +1187,12 @@ static void enh_prepare_cfr_header_txstatus(wmi_cfr_peer_tx_event_param 
					    uint32_t target_type)

{

	target_if_cfr_fill_header(header, false, target_type, false);

	header->u.meta_v5.status       = 0; /* failure */

	header->u.meta_v5.length       = 0;

	header->u.meta_v5.rtt_cfo_measurement = tx_evt_param->cfo_measurement;

	header->u.meta_v5.rx_start_ts = tx_evt_param->rx_start_ts;

	header->u.meta_enh.status       = 0; /* failure */

	header->u.meta_enh.length       = 0;

	header->u.meta_enh.rtt_cfo_measurement = tx_evt_param->cfo_measurement;

	header->u.meta_enh.rx_start_ts = tx_evt_param->rx_start_ts;



	qdf_mem_copy(&header->u.meta_v5.peer_addr.su_peer_addr[0],

	qdf_mem_copy(&header->u.meta_enh.peer_addr.su_peer_addr[0],

		     &tx_evt_param->peer_mac_addr.bytes[0], QDF_MAC_ADDR_SIZE);

}
@@ -1374,41 +1374,41 @@ target_if_peer_capture_event(ol_scn_t sc, uint8_t *data, uint32_t datalen) 


	header = &lut->header;

	target_if_cfr_fill_header(header, false, target_type, false);

	header->u.meta_v5.status       = (tx_evt_param.status &

	header->u.meta_enh.status       = (tx_evt_param.status &

					   PEER_CFR_CAPTURE_EVT_STATUS_MASK) ?

					   1 : 0;

	header->u.meta_v5.capture_bw   = tx_evt_param.bandwidth;

	header->u.meta_enh.capture_bw   = tx_evt_param.bandwidth;



	bss_chan = wlan_vdev_mlme_get_bss_chan(vdev);

	header->u.meta_v5.phy_mode     = bss_chan->ch_phymode;

	header->u.meta_enh.phy_mode     = bss_chan->ch_phymode;



	header->u.meta_v5.prim20_chan  = tx_evt_param.primary_20mhz_chan;

	header->u.meta_v5.center_freq1 = tx_evt_param.band_center_freq1;

	header->u.meta_v5.center_freq2 = tx_evt_param.band_center_freq2;

	header->u.meta_enh.prim20_chan  = tx_evt_param.primary_20mhz_chan;

	header->u.meta_enh.center_freq1 = tx_evt_param.band_center_freq1;

	header->u.meta_enh.center_freq2 = tx_evt_param.band_center_freq2;



	/* Currently CFR data is captured on ACK of a Qos NULL frame.

	 * For 20 MHz, ACK is Legacy and for 40/80/160, ACK is DUP Legacy.

	 */

	header->u.meta_v5.capture_mode = tx_evt_param.bandwidth ?

	header->u.meta_enh.capture_mode = tx_evt_param.bandwidth ?

		CFR_DUP_LEGACY_ACK : CFR_LEGACY_ACK;

	header->u.meta_v5.capture_type = tx_evt_param.capture_method;

	header->u.meta_v5.num_rx_chain = wlan_vdev_mlme_get_rxchainmask(vdev);

	header->u.meta_v5.sts_count    = tx_evt_param.spatial_streams;

	header->u.meta_v5.timestamp    = tx_evt_param.timestamp_us;

	header->u.meta_enh.capture_type = tx_evt_param.capture_method;

	header->u.meta_enh.num_rx_chain = wlan_vdev_mlme_get_rxchainmask(vdev);

	header->u.meta_enh.sts_count    = tx_evt_param.spatial_streams;

	header->u.meta_enh.timestamp    = tx_evt_param.timestamp_us;



	qdf_mem_copy(&header->u.meta_v5.peer_addr.su_peer_addr[0],

	qdf_mem_copy(&header->u.meta_enh.peer_addr.su_peer_addr[0],

		     &tx_evt_param.peer_mac_addr.bytes[0], QDF_MAC_ADDR_SIZE);

	qdf_mem_copy(&header->u.meta_v5.chain_rssi[0],

	qdf_mem_copy(&header->u.meta_enh.chain_rssi[0],

		     &tx_evt_param.chain_rssi[0],

		     HOST_MAX_CHAINS * sizeof(tx_evt_param.chain_rssi[0]));

	qdf_mem_copy(&header->u.meta_v5.chain_phase[0],

	qdf_mem_copy(&header->u.meta_enh.chain_phase[0],

		     &tx_evt_param.chain_phase[0],

		     HOST_MAX_CHAINS * sizeof(tx_evt_param.chain_phase[0]));

	qdf_mem_copy(&header->u.meta_v5.agc_gain[0],

	qdf_mem_copy(&header->u.meta_enh.agc_gain[0],

		     &tx_evt_param.agc_gain[0],

		     HOST_MAX_CHAINS * sizeof(tx_evt_param.agc_gain[0]));

	header->u.meta_v5.rtt_cfo_measurement = tx_evt_param.cfo_measurement;

	header->u.meta_v5.rx_start_ts = tx_evt_param.rx_start_ts;

	header->u.meta_enh.rtt_cfo_measurement = tx_evt_param.cfo_measurement;

	header->u.meta_enh.rx_start_ts = tx_evt_param.rx_start_ts;



	status = correlate_and_relay_enh(pdev, cookie, lut,

					 CORRELATE_TX_EV_MODULE_ID);