From cb709cad189f7b1e8e0dd3e161be5220cd057bd2 Mon Sep 17 00:00:00 2001
From: Jayachandran Sreekumaran <jsreekum@codeaurora.org>
Date: Wed, 10 Jun 2020 16:52:15 +0530
Subject: [PATCH] qcacmn: iot_sim code cleanup in wmi

Refactor code and put iot_sim code under feature flag.

Change-Id: Id4720d63ae174d9f4490285e6eb69ab2972ccd28
CRs-Fixed: 2707122
---
 wmi/inc/wmi_unified_api.h   |  6 ++++++
 wmi/inc/wmi_unified_param.h | 31 -------------------------------
 wmi/inc/wmi_unified_priv.h  |  2 ++
 wmi/src/wmi_unified_api.c   |  2 ++
 wmi/src/wmi_unified_tlv.c   |  4 ++++
 5 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/wmi/inc/wmi_unified_api.h b/wmi/inc/wmi_unified_api.h
index 4de8771b11..1a4e4a11e1 100644
--- a/wmi/inc/wmi_unified_api.h
+++ b/wmi/inc/wmi_unified_api.h
@@ -109,6 +109,10 @@
 #include "wlan_pkt_capture_public_structs.h"
 #endif
 
+#ifdef WLAN_IOT_SIM_SUPPORT
+#include "wlan_iot_sim_public_structs.h"
+#endif
+
 typedef qdf_nbuf_t wmi_buf_t;
 #define wmi_buf_data(_buf) qdf_nbuf_data(_buf)
 
@@ -1993,6 +1997,7 @@ QDF_STATUS wmi_unified_smart_ant_enable_tx_feedback_cmd_send(
 			wmi_unified_t wmi_handle,
 			struct smart_ant_enable_tx_feedback_params *param);
 
+#ifdef WLAN_IOT_SIM_SUPPORT
 /**
  *  wmi_unified_simulation_test_cmd_send() -
  *  WMI simulation test command
@@ -2004,6 +2009,7 @@ QDF_STATUS wmi_unified_smart_ant_enable_tx_feedback_cmd_send(
 QDF_STATUS wmi_unified_simulation_test_cmd_send(wmi_unified_t wmi_handle,
 						struct simulation_test_params
 						*param);
+#endif
 
 /**
  *  wmi_unified_vdev_spectral_configure_cmd_send() -
diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h
index 5231c9f7db..7a3bd25f72 100644
--- a/wmi/inc/wmi_unified_param.h
+++ b/wmi/inc/wmi_unified_param.h
@@ -2919,37 +2919,6 @@ struct smart_ant_enable_tx_feedback_params {
 	int enable;
 };
 
-/**
- * struct simulation_test_params
- * pdev_id: pdev id
- * vdev_id: vdev id
- * peer_macaddr: peer MAC address
- * test_cmd_type: test command type
- * test_subcmd_type: test command sub type
- * frame_type: frame type
- * frame_subtype: frame subtype
- * seq: sequence number
- * offset: Frame content offset
- * frame_length: Frame content length
- * buf_len: Buffer length
- * bufp: buffer
- */
-struct simulation_test_params {
-	u32 pdev_id;
-	u32 vdev_id;
-	u8 peer_mac[QDF_MAC_ADDR_SIZE];
-	u32 test_cmd_type;
-	u32 test_subcmd_type;
-	u8 frame_type;
-	u8 frame_subtype;
-	u8 seq;
-	u8 reserved;
-	u16 offset;
-	u16 frame_length;
-	u32 buf_len;
-	u8 *bufp;
-};
-
 /**
  * struct vdev_spectral_configure_params - SPectral config params
  * @vdev_id: VDEV id
diff --git a/wmi/inc/wmi_unified_priv.h b/wmi/inc/wmi_unified_priv.h
index 89608d083d..20f8ff7368 100644
--- a/wmi/inc/wmi_unified_priv.h
+++ b/wmi/inc/wmi_unified_priv.h
@@ -1205,8 +1205,10 @@ QDF_STATUS (*send_smart_ant_set_node_config_cmd)(wmi_unified_t wmi_handle,
 		struct smart_ant_node_config_params *param);
 #endif
 
+#ifdef WLAN_IOT_SIM_SUPPORT
 QDF_STATUS (*send_simulation_test_cmd)(wmi_unified_t wmi_handle,
 				       struct simulation_test_params *param);
+#endif
 
 QDF_STATUS (*send_smart_ant_enable_tx_feedback_cmd)(wmi_unified_t wmi_handle,
 		struct smart_ant_enable_tx_feedback_params *param);
diff --git a/wmi/src/wmi_unified_api.c b/wmi/src/wmi_unified_api.c
index 34d73a9ddb..c759c98dc1 100644
--- a/wmi/src/wmi_unified_api.c
+++ b/wmi/src/wmi_unified_api.c
@@ -1296,6 +1296,7 @@ wmi_unified_smart_ant_enable_tx_feedback_cmd_send(
 }
 qdf_export_symbol(wmi_unified_smart_ant_enable_tx_feedback_cmd_send);
 
+#ifdef WLAN_IOT_SIM_SUPPORT
 QDF_STATUS
 wmi_unified_simulation_test_cmd_send(
 		wmi_unified_t wmi_handle,
@@ -1308,6 +1309,7 @@ wmi_unified_simulation_test_cmd_send(
 	return QDF_STATUS_E_FAILURE;
 }
 qdf_export_symbol(wmi_unified_simulation_test_cmd_send);
+#endif
 
 QDF_STATUS
 wmi_unified_vdev_spectral_configure_cmd_send(
diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c
index 297a6992b1..6c273b3de5 100644
--- a/wmi/src/wmi_unified_tlv.c
+++ b/wmi/src/wmi_unified_tlv.c
@@ -6415,6 +6415,7 @@ send_periodic_chan_stats_config_cmd_tlv(wmi_unified_t wmi_handle,
 	return ret;
 }
 
+#ifdef WLAN_IOT_SIM_SUPPORT
 /**
  * send_simulation_test_cmd_tlv() - send simulation test command to fw
  *
@@ -6480,6 +6481,7 @@ static QDF_STATUS send_simulation_test_cmd_tlv(wmi_unified_t wmi_handle,
 
 	return QDF_STATUS_SUCCESS;
 }
+#endif
 
 /**
  * send_vdev_spectral_configure_cmd_tlv() - send VDEV spectral configure
@@ -14295,7 +14297,9 @@ struct wmi_ops tlv_ops =  {
 	.send_phyerr_enable_cmd = send_phyerr_enable_cmd_tlv,
 	.send_periodic_chan_stats_config_cmd =
 		send_periodic_chan_stats_config_cmd_tlv,
+#ifdef WLAN_IOT_SIM_SUPPORT
 	.send_simulation_test_cmd = send_simulation_test_cmd_tlv,
+#endif
 	.send_vdev_spectral_configure_cmd =
 				send_vdev_spectral_configure_cmd_tlv,
 	.send_vdev_spectral_enable_cmd =