qcacmn: Add non-tlv implementation in common wmi layer

WIN platform uses non-tlv implementation for host to
target wmi commands. Add support for non-tlv
implementation in common wmi layer.

Change-Id: I1f832695b0d41b521be6b18df0cad31aae11b6c9
Acked-by: Kiran Venkatappa <kiranv@qti.qualcomm.com>
CRs-Fixed: 1005778
diff --git a/wmi_unified_priv.h b/wmi_unified_priv.h
index 267b687..6957008 100644
--- a/wmi_unified_priv.h
+++ b/wmi_unified_priv.h
@@ -35,6 +35,7 @@
 #include "a_types.h"
 #include "wmi.h"
 #include "wmi_unified.h"
+#include "wmi_unified_param.h"
 #include "qdf_atomic.h"
 
 #define WMI_UNIFIED_MAX_EVENT 0x100
@@ -152,13 +153,23 @@
 				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct stats_request_params *param);
 
+#ifdef WMI_NON_TLV_SUPPORT
+QDF_STATUS (*send_packet_log_enable_cmd)(wmi_unified_t wmi_handle,
+				WMI_HOST_PKTLOG_EVENT PKTLOG_EVENT);
+#else
 QDF_STATUS (*send_packet_log_enable_cmd)(wmi_unified_t wmi_handle,
 				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct packet_enable_params *param);
+#endif
+
+QDF_STATUS (*send_packet_log_disable_cmd)(wmi_unified_t wmi_handle);
 
 QDF_STATUS (*send_beacon_send_cmd)(wmi_unified_t wmi_handle,
 				struct beacon_params *param);
 
+QDF_STATUS (*send_beacon_tmpl_send_cmd)(wmi_unified_t wmi_handle,
+				struct beacon_tmpl_params *param);
+
 QDF_STATUS (*send_peer_assoc_cmd)(wmi_unified_t wmi_handle,
 				struct peer_assoc_params *param);
 
@@ -251,9 +262,11 @@
 QDF_STATUS (*send_setup_install_key_cmd)(wmi_unified_t wmi_handle,
 				struct set_key_params *key_params);
 
+#ifndef WMI_NON_TLV_SUPPORT
 QDF_STATUS (*send_process_update_edca_param_cmd)(wmi_unified_t wmi_handle,
 			     uint8_t vdev_id,
 			     wmi_wmm_vparams gwmm_param[WMI_MAX_NUM_AC]);
+#endif
 
 QDF_STATUS (*send_vdev_set_gtx_cfg_cmd)(wmi_unified_t wmi_handle,
 				  uint32_t if_id,
@@ -265,9 +278,10 @@
 QDF_STATUS (*send_set_sta_sa_query_param_cmd)(wmi_unified_t wmi_handle,
 				       uint8_t vdev_id, uint32_t max_retries,
 					   uint32_t retry_interval);
-
+#ifndef WMI_NON_TLV_SUPPORT
 QDF_STATUS (*send_bcn_buf_ll_cmd)(wmi_unified_t wmi_handle,
 			wmi_bcn_send_from_host_cmd_fixed_param *param);
+#endif
 
 QDF_STATUS (*send_set_gateway_params_cmd)(wmi_unified_t wmi_handle,
 					struct gateway_update_req_param *req);
@@ -280,10 +294,11 @@
 
 QDF_STATUS (*send_reset_passpoint_network_list_cmd)(wmi_unified_t wmi_handle,
 					struct wifi_passpoint_req_param *req);
-
+#ifndef WMI_NON_TLV_SUPPORT
 QDF_STATUS (*send_roam_scan_offload_mode_cmd)(wmi_unified_t wmi_handle,
 				wmi_start_scan_cmd_fixed_param *scan_cmd_fp,
 				struct roam_offload_scan_params *roam_req);
+#endif
 
 QDF_STATUS (*send_roam_scan_offload_rssi_thresh_cmd)(wmi_unified_t wmi_handle,
 				struct roam_offload_scan_rssi_params *roam_req);
@@ -322,6 +337,7 @@
 QDF_STATUS (*send_plm_stop_cmd)(wmi_unified_t wmi_handle,
 		 const struct plm_req_params *plm);
 
+
 QDF_STATUS (*send_plm_start_cmd)(wmi_unified_t wmi_handle,
 		  const struct plm_req_params *plm,
 		  uint32_t *gchannel_list);
@@ -331,9 +347,11 @@
 
 QDF_STATUS (*send_pno_stop_cmd)(wmi_unified_t wmi_handle, uint8_t vdev_id);
 
+#ifdef FEATURE_WLAN_SCAN_PNO
 QDF_STATUS (*send_pno_start_cmd)(wmi_unified_t wmi_handle,
 		   struct pno_scan_req_params *pno,
 		   uint32_t *gchannel_freq_list);
+#endif
 
 QDF_STATUS (*send_ipa_offload_control_cmd)(wmi_unified_t wmi_handle,
 		struct ipa_offload_control_params *ipa_offload);
@@ -363,7 +381,7 @@
 
 QDF_STATUS (*send_link_status_req_cmd)(wmi_unified_t wmi_handle,
 				 struct link_status_params *link_status);
-
+#ifndef WMI_NON_TLV_SUPPORT
 QDF_STATUS (*send_lphb_config_hbenable_cmd)(wmi_unified_t wmi_handle,
 				wmi_hb_set_enable_cmd_fixed_param *params);
 
@@ -387,6 +405,7 @@
 
 QDF_STATUS (*send_egap_conf_params_cmd)(wmi_unified_t wmi_handle,
 				     wmi_ap_ps_egap_param_cmd_fixed_param *egap_params);
+#endif
 
 QDF_STATUS (*send_fw_profiling_cmd)(wmi_unified_t wmi_handle,
 			uint32_t cmd, uint32_t value1, uint32_t value2);
@@ -404,10 +423,11 @@
 QDF_STATUS
 (*send_dfs_phyerr_filter_offload_en_cmd)(wmi_unified_t wmi_handle,
 			bool dfs_phyerr_filter_offload);
-
+#ifndef WMI_NON_TLV_SUPPORT
 QDF_STATUS (*send_pktlog_wmi_send_cmd)(wmi_unified_t wmi_handle,
 				   WMI_PKTLOG_EVENT pktlog_event,
 				   WMI_CMD_ID cmd_id);
+#endif
 
 QDF_STATUS (*send_add_wow_wakeup_event_cmd)(wmi_unified_t wmi_handle,
 					uint32_t vdev_id,
@@ -564,10 +584,11 @@
 
 QDF_STATUS (*send_roam_scan_offload_cmd)(wmi_unified_t wmi_handle,
 				 uint32_t command, uint32_t vdev_id);
-
+#ifndef WMI_NON_TLV_SUPPORT
 QDF_STATUS (*send_roam_scan_offload_ap_profile_cmd)(wmi_unified_t wmi_handle,
 				    wmi_ap_profile *ap_profile_p,
 				    uint32_t vdev_id);
+#endif
 
 QDF_STATUS (*send_roam_scan_offload_scan_period_cmd)(wmi_unified_t wmi_handle,
 				     uint32_t scan_period,
@@ -588,6 +609,431 @@
 QDF_STATUS (*send_get_buf_extscan_hotlist_cmd)(wmi_unified_t wmi_handle,
 				   struct ext_scan_setbssi_hotlist_params *
 				   photlist, int *buf_len);
+
+QDF_STATUS (*send_pdev_get_tpc_config_cmd)(wmi_unified_t wmi_handle,
+		uint32_t param);
+
+QDF_STATUS (*send_set_atf_cmd)(wmi_unified_t wmi_handle,
+		struct set_atf_params *param);
+
+QDF_STATUS (*send_pdev_fips_cmd)(wmi_unified_t wmi_handle,
+		struct fips_params *param);
+
+QDF_STATUS (*send_wlan_profile_enable_cmd)(wmi_unified_t wmi_handle,
+		struct wlan_profile_params *param);
+
+QDF_STATUS (*send_wlan_profile_trigger_cmd)(wmi_unified_t wmi_handle,
+		struct wlan_profile_params *param);
+
+QDF_STATUS (*send_pdev_set_chan_cmd)(wmi_unified_t wmi_handle,
+		struct channel_param *param);
+
+QDF_STATUS (*send_set_ht_ie_cmd)(wmi_unified_t wmi_handle,
+		struct ht_ie_params *param);
+
+QDF_STATUS (*send_set_vht_ie_cmd)(wmi_unified_t wmi_handle,
+		struct vht_ie_params *param);
+
+QDF_STATUS (*send_wmm_update_cmd)(wmi_unified_t wmi_handle,
+		struct wmm_update_params *param);
+
+QDF_STATUS (*send_set_ant_switch_tbl_cmd)(wmi_unified_t wmi_handle,
+		struct ant_switch_tbl_params *param);
+
+QDF_STATUS (*send_set_ratepwr_table_cmd)(wmi_unified_t wmi_handle,
+		struct ratepwr_table_params *param);
+
+QDF_STATUS (*send_get_ratepwr_table_cmd)(wmi_unified_t wmi_handle);
+
+QDF_STATUS (*send_set_ctl_table_cmd)(wmi_unified_t wmi_handle,
+		struct ctl_table_params *param);
+
+QDF_STATUS (*send_set_mimogain_table_cmd)(wmi_unified_t wmi_handle,
+		struct mimogain_table_params *param);
+
+QDF_STATUS (*send_set_ratepwr_chainmsk_cmd)(wmi_unified_t wmi_handle,
+		struct ratepwr_chainmsk_params *param);
+
+QDF_STATUS (*send_set_macaddr_cmd)(wmi_unified_t wmi_handle,
+		struct macaddr_params *param);
+
+QDF_STATUS (*send_pdev_scan_start_cmd)(wmi_unified_t wmi_handle);
+
+QDF_STATUS (*send_pdev_scan_end_cmd)(wmi_unified_t wmi_handle);
+
+QDF_STATUS (*send_set_acparams_cmd)(wmi_unified_t wmi_handle,
+		struct acparams_params *param);
+
+QDF_STATUS (*send_set_vap_dscp_tid_map_cmd)(wmi_unified_t wmi_handle,
+		struct vap_dscp_tid_map_params *param);
+
+QDF_STATUS (*send_proxy_ast_reserve_cmd)(wmi_unified_t wmi_handle,
+		struct proxy_ast_reserve_params *param);
+
+QDF_STATUS (*send_pdev_qvit_cmd)(wmi_unified_t wmi_handle,
+		struct pdev_qvit_params *param);
+
+QDF_STATUS (*send_mcast_group_update_cmd)(wmi_unified_t wmi_handle,
+		struct mcast_group_update_params *param);
+
+QDF_STATUS (*send_peer_add_wds_entry_cmd)(wmi_unified_t wmi_handle,
+		struct peer_add_wds_entry_params *param);
+
+QDF_STATUS (*send_peer_del_wds_entry_cmd)(wmi_unified_t wmi_handle,
+		struct peer_del_wds_entry_params *param);
+
+QDF_STATUS (*send_peer_update_wds_entry_cmd)(wmi_unified_t wmi_handle,
+		struct peer_update_wds_entry_params *param);
+
+QDF_STATUS (*send_phyerr_enable_cmd)(wmi_unified_t wmi_handle);
+
+QDF_STATUS (*send_phyerr_disable_cmd)(wmi_unified_t wmi_handle);
+
+QDF_STATUS (*send_smart_ant_enable_cmd)(wmi_unified_t wmi_handle,
+		struct smart_ant_enable_params *param);
+
+QDF_STATUS (*send_smart_ant_set_rx_ant_cmd)(wmi_unified_t wmi_handle,
+		struct smart_ant_rx_ant_params *param);
+
+QDF_STATUS (*send_smart_ant_set_tx_ant_cmd)(wmi_unified_t wmi_handle,
+		uint8_t macaddr[IEEE80211_ADDR_LEN],
+		struct smart_ant_tx_ant_params *param);
+
+QDF_STATUS (*send_smart_ant_set_training_info_cmd)(wmi_unified_t wmi_handle,
+		uint8_t macaddr[IEEE80211_ADDR_LEN],
+		struct smart_ant_training_info_params *param);
+
+QDF_STATUS (*send_smart_ant_set_node_config_cmd)(wmi_unified_t wmi_handle,
+		uint8_t macaddr[IEEE80211_ADDR_LEN],
+		struct smart_ant_node_config_params *param);
+
+QDF_STATUS (*send_smart_ant_enable_tx_feedback_cmd)(wmi_unified_t wmi_handle,
+		struct smart_ant_enable_tx_feedback_params *param);
+
+QDF_STATUS (*send_vdev_spectral_configure_cmd)(wmi_unified_t wmi_handle,
+		struct vdev_spectral_configure_params *param);
+
+QDF_STATUS (*send_vdev_spectral_enable_cmd)(wmi_unified_t wmi_handle,
+		struct vdev_spectral_enable_params *param);
+
+QDF_STATUS (*send_bss_chan_info_request_cmd)(wmi_unified_t wmi_handle,
+		struct bss_chan_info_request_params *param);
+
+QDF_STATUS (*send_thermal_mitigation_param_cmd)(wmi_unified_t wmi_handle,
+		struct thermal_mitigation_params *param);
+
+QDF_STATUS (*send_vdev_set_neighbour_rx_cmd)(wmi_unified_t wmi_handle,
+		uint8_t macaddr[IEEE80211_ADDR_LEN],
+		struct set_neighbour_rx_params *param);
+
+QDF_STATUS (*send_vdev_set_fwtest_param_cmd)(wmi_unified_t wmi_handle,
+		struct set_fwtest_params *param);
+
+QDF_STATUS (*send_vdev_config_ratemask_cmd)(wmi_unified_t wmi_handle,
+		struct config_ratemask_params *param);
+
+QDF_STATUS (*send_vdev_install_key_cmd)(wmi_unified_t wmi_handle,
+		uint8_t macaddr[IEEE80211_ADDR_LEN],
+		struct vdev_install_key_params *param);
+
+QDF_STATUS (*send_wow_wakeup_cmd)(wmi_unified_t wmi_handle);
+
+QDF_STATUS (*send_wow_add_wakeup_event_cmd)(wmi_unified_t wmi_handle,
+		struct wow_add_wakeup_params *param);
+
+QDF_STATUS (*send_wow_add_wakeup_pattern_cmd)(wmi_unified_t wmi_handle,
+		struct wow_add_wakeup_pattern_params *param);
+
+QDF_STATUS (*send_wow_remove_wakeup_pattern_cmd)(wmi_unified_t wmi_handle,
+		struct wow_remove_wakeup_pattern_params *param);
+
+QDF_STATUS (*send_pdev_set_regdomain_cmd)(wmi_unified_t wmi_handle,
+		struct pdev_set_regdomain_params *param);
+
+QDF_STATUS (*send_set_quiet_mode_cmd)(wmi_unified_t wmi_handle,
+		struct set_quiet_mode_params *param);
+
+QDF_STATUS (*send_set_beacon_filter_cmd)(wmi_unified_t wmi_handle,
+		struct set_beacon_filter_params *param);
+
+QDF_STATUS (*send_remove_beacon_filter_cmd)(wmi_unified_t wmi_handle,
+		struct remove_beacon_filter_params *param);
+/*
+QDF_STATUS (*send_mgmt_cmd)(wmi_unified_t wmi_handle,
+		uint8_t macaddr[IEEE80211_ADDR_LEN],
+		struct mgmt_params *param);
+		*/
+
+QDF_STATUS (*send_addba_clearresponse_cmd)(wmi_unified_t wmi_handle,
+		uint8_t macaddr[IEEE80211_ADDR_LEN],
+		struct addba_clearresponse_params *param);
+
+QDF_STATUS (*send_addba_send_cmd)(wmi_unified_t wmi_handle,
+		uint8_t macaddr[IEEE80211_ADDR_LEN],
+		struct addba_send_params *param);
+
+QDF_STATUS (*send_delba_send_cmd)(wmi_unified_t wmi_handle,
+		uint8_t macaddr[IEEE80211_ADDR_LEN],
+		struct delba_send_params *param);
+
+QDF_STATUS (*send_addba_setresponse_cmd)(wmi_unified_t wmi_handle,
+		uint8_t macaddr[IEEE80211_ADDR_LEN],
+		struct addba_setresponse_params *param);
+
+QDF_STATUS (*send_singleamsdu_cmd)(wmi_unified_t wmi_handle,
+		uint8_t macaddr[IEEE80211_ADDR_LEN],
+		struct singleamsdu_params *param);
+
+QDF_STATUS (*send_set_qboost_param_cmd)(wmi_unified_t wmi_handle,
+		uint8_t macaddr[IEEE80211_ADDR_LEN],
+		struct set_qboost_params *param);
+
+QDF_STATUS (*send_mu_scan_cmd)(wmi_unified_t wmi_handle,
+		struct mu_scan_params *param);
+
+QDF_STATUS (*send_lteu_config_cmd)(wmi_unified_t wmi_handle,
+		struct lteu_config_params *param);
+
+QDF_STATUS (*send_set_ps_mode_cmd)(wmi_unified_t wmi_handle,
+		       struct set_ps_mode_params *param);
+void (*save_service_bitmap)(wmi_unified_t wmi_handle,
+		void *evt_buf);
+bool (*is_service_enabled)(wmi_unified_t wmi_handle,
+	uint32_t service_id);
+QDF_STATUS (*get_target_cap_from_service_ready)(wmi_unified_t wmi_handle,
+	void *evt_buf, target_capability_info *ev);
+
+QDF_STATUS (*extract_fw_version)(wmi_unified_t wmi_handle,
+				void *ev, struct wmi_host_fw_ver *fw_ver);
+
+QDF_STATUS (*extract_fw_abi_version)(wmi_unified_t wmi_handle,
+				void *ev, struct wmi_host_fw_abi_ver *fw_ver);
+
+QDF_STATUS (*extract_hal_reg_cap)(wmi_unified_t wmi_handle, void *evt_buf,
+	TARGET_HAL_REG_CAPABILITIES *hal_reg_cap);
+
+host_mem_req * (*extract_host_mem_req)(wmi_unified_t wmi_handle,
+	void *evt_buf, uint8_t *num_entries);
+
+QDF_STATUS (*init_cmd_send)(wmi_unified_t wmi_handle,
+		target_resource_config *res_cfg,
+		uint8_t num_mem_chunks,
+		struct wmi_host_mem_chunk *mem_chunk);
+
+QDF_STATUS (*save_fw_version)(wmi_unified_t wmi_handle, void *evt_buf);
+uint32_t (*ready_extract_init_status)(wmi_unified_t wmi_hdl, void *ev);
+QDF_STATUS (*ready_extract_mac_addr)(wmi_unified_t wmi_hdl, void *ev,
+		uint8_t *macaddr);
+QDF_STATUS (*check_and_update_fw_version)(wmi_unified_t wmi_hdl, void *ev);
+uint8_t* (*extract_dbglog_data_len)(wmi_unified_t wmi_handle, void *evt_buf,
+		uint16_t *len);
+QDF_STATUS (*send_ext_resource_config)(wmi_unified_t wmi_handle,
+		wmi_host_ext_resource_config *ext_cfg);
+
+QDF_STATUS (*send_nf_dbr_dbm_info_get_cmd)(wmi_unified_t wmi_handle);
+
+QDF_STATUS (*send_packet_power_info_get_cmd)(wmi_unified_t wmi_handle,
+		      struct packet_power_info_params *param);
+
+QDF_STATUS (*send_gpio_config_cmd)(wmi_unified_t wmi_handle,
+		      struct gpio_config_params *param);
+
+QDF_STATUS (*send_gpio_output_cmd)(wmi_unified_t wmi_handle,
+		      struct gpio_output_params *param);
+
+QDF_STATUS (*send_rtt_meas_req_test_cmd)(wmi_unified_t wmi_handle,
+		      struct rtt_meas_req_test_params *param);
+
+QDF_STATUS (*send_rtt_meas_req_cmd)(wmi_unified_t wmi_handle,
+		      struct rtt_meas_req_params *param);
+
+QDF_STATUS (*send_rtt_keepalive_req_cmd)(wmi_unified_t wmi_handle,
+		      struct rtt_keepalive_req_params *param);
+
+QDF_STATUS (*send_lci_set_cmd)(wmi_unified_t wmi_handle,
+		      struct lci_set_params *param);
+
+QDF_STATUS (*send_lcr_set_cmd)(wmi_unified_t wmi_handle,
+		      struct lcr_set_params *param);
+
+QDF_STATUS (*send_periodic_chan_stats_config_cmd)(wmi_unified_t wmi_handle,
+			struct periodic_chan_stats_params *param);
+
+QDF_STATUS
+(*send_atf_peer_request_cmd)(wmi_unified_t wmi_handle,
+			struct atf_peer_request_params *param);
+
+QDF_STATUS
+(*send_set_atf_grouping_cmd)(wmi_unified_t wmi_handle,
+			struct atf_grouping_params *param);
+
+QDF_STATUS (*extract_wds_addr_event)(wmi_unified_t wmi_handle,
+	void *evt_buf, uint16_t len, wds_addr_event_t *wds_ev);
+
+QDF_STATUS (*extract_dcs_interference_type)(wmi_unified_t wmi_handle,
+	void *evt_buf, uint32_t *interference_type);
+
+QDF_STATUS (*extract_dcs_cw_int)(wmi_unified_t wmi_handle, void *evt_buf,
+	wmi_host_ath_dcs_cw_int *cw_int);
+
+QDF_STATUS (*extract_dcs_im_tgt_stats)(wmi_unified_t wmi_handle, void *evt_buf,
+	wmi_host_dcs_im_tgt_stats_t *wlan_stat);
+
+QDF_STATUS (*extract_fips_event_error_status)(wmi_unified_t wmi_handle,
+	void *evt_buf, uint32_t *err_status);
+
+QDF_STATUS (*extract_fips_event_data)(wmi_unified_t wmi_handle,
+	void *evt_buf, uint32_t *data_len, uint32_t **data);
+QDF_STATUS (*extract_vdev_start_resp)(wmi_unified_t wmi_handle, void *evt_buf,
+	wmi_host_vdev_start_resp *vdev_rsp);
+
+QDF_STATUS (*extract_tbttoffset_update_params)(void *wmi_hdl, void *evt_buf,
+	uint32_t *vdev_map, uint32_t **tbttoffset_list);
+
+QDF_STATUS (*extract_mgmt_rx_params)(wmi_unified_t wmi_handle, void *evt_buf,
+	wmi_host_mgmt_rx_hdr *hdr, uint8_t **bufp);
+
+QDF_STATUS (*extract_vdev_stopped_param)(wmi_unified_t wmi_handle,
+		void *evt_buf, uint32_t *vdev_id);
+
+QDF_STATUS (*extract_vdev_roam_param)(wmi_unified_t wmi_handle, void *evt_buf,
+	wmi_host_roam_event *param);
+
+QDF_STATUS (*extract_vdev_scan_ev_param)(wmi_unified_t wmi_handle,
+		void *evt_buf, wmi_host_scan_event *param);
+
+QDF_STATUS (*extract_mu_ev_param)(wmi_unified_t wmi_handle, void *evt_buf,
+	wmi_host_mu_report_event *param);
+
+QDF_STATUS (*extract_pdev_tpc_config_ev_param)(wmi_unified_t wmi_handle,
+		void *evt_buf, wmi_host_pdev_tpc_config_event *param);
+
+QDF_STATUS (*extract_gpio_input_ev_param)(wmi_unified_t wmi_handle,
+	void *evt_buf, uint32_t *gpio_num);
+
+QDF_STATUS (*extract_pdev_reserve_ast_ev_param)(wmi_unified_t wmi_handle,
+	void *evt_buf, uint32_t *result);
+
+QDF_STATUS (*extract_nfcal_power_ev_param)(wmi_unified_t wmi_handle,
+		void *evt_buf,
+		wmi_host_pdev_nfcal_power_all_channels_event *param);
+
+QDF_STATUS (*extract_pdev_tpc_ev_param)(wmi_unified_t wmi_handle,
+		void *evt_buf, wmi_host_pdev_tpc_event *param);
+
+QDF_STATUS (*extract_pdev_generic_buffer_ev_param)(wmi_unified_t wmi_handle,
+		void *evt_buf, wmi_host_pdev_generic_buffer_event *param);
+
+QDF_STATUS (*extract_mgmt_tx_compl_param)(wmi_unified_t wmi_handle,
+		void *evt_buf, wmi_host_mgmt_tx_compl_event *param);
+
+QDF_STATUS (*extract_swba_vdev_map)(wmi_unified_t wmi_handle, void *evt_buf,
+	uint32_t *vdev_map);
+
+QDF_STATUS (*extract_swba_tim_info)(wmi_unified_t wmi_handle, void *evt_buf,
+	uint32_t idx, wmi_host_tim_info *tim_info);
+
+QDF_STATUS (*extract_swba_noa_info)(wmi_unified_t wmi_handle, void *evt_buf,
+	    uint32_t idx, wmi_host_p2p_noa_info *p2p_desc);
+
+QDF_STATUS (*extract_peer_sta_ps_statechange_ev)(wmi_unified_t wmi_handle,
+	void *evt_buf, wmi_host_peer_sta_ps_statechange_event *ev);
+
+QDF_STATUS (*extract_peer_sta_kickout_ev)(wmi_unified_t wmi_handle,
+		void *evt_buf, wmi_host_peer_sta_kickout_event *ev);
+
+QDF_STATUS (*extract_peer_ratecode_list_ev)(wmi_unified_t wmi_handle,
+		void *evt_buf, uint8_t *peer_mac, wmi_sa_rate_cap *rate_cap);
+
+QDF_STATUS (*extract_comb_phyerr)(wmi_unified_t wmi_handle, void *evt_buf,
+	uint16_t datalen, uint16_t *buf_offset, wmi_host_phyerr_t *phyerr);
+
+QDF_STATUS (*extract_single_phyerr)(wmi_unified_t wmi_handle, void *evt_buf,
+	uint16_t datalen, uint16_t *buf_offset, wmi_host_phyerr_t *phyerr);
+
+QDF_STATUS (*extract_composite_phyerr)(wmi_unified_t wmi_handle, void *evt_buf,
+	uint16_t datalen, wmi_host_phyerr_t *phyerr);
+
+QDF_STATUS (*extract_rtt_hdr)(wmi_unified_t wmi_handle, void *evt_buf,
+	wmi_host_rtt_event_hdr *ev);
+
+QDF_STATUS (*extract_rtt_ev)(wmi_unified_t wmi_handle, void *evt_buf,
+	wmi_host_rtt_meas_event *ev, uint8_t *hdump, uint16_t hdump_len);
+
+QDF_STATUS (*extract_rtt_error_report_ev)(wmi_unified_t wmi_handle,
+		void *evt_buf, wmi_host_rtt_error_report_event *ev);
+
+QDF_STATUS (*extract_all_stats_count)(wmi_unified_t wmi_handle, void *evt_buf,
+			   wmi_host_stats_event *stats_param);
+
+QDF_STATUS (*extract_pdev_stats)(wmi_unified_t wmi_handle, void *evt_buf,
+			 uint32_t index, wmi_host_pdev_stats *pdev_stats);
+
+QDF_STATUS (*extract_pdev_ext_stats)(wmi_unified_t wmi_handle, void *evt_buf,
+		 uint32_t index, wmi_host_pdev_ext_stats *pdev_ext_stats);
+
+QDF_STATUS (*extract_vdev_stats)(wmi_unified_t wmi_handle, void *evt_buf,
+			 uint32_t index, wmi_host_vdev_stats *vdev_stats);
+
+QDF_STATUS (*extract_peer_stats)(wmi_unified_t wmi_handle, void *evt_buf,
+			 uint32_t index, wmi_host_peer_stats *peer_stats);
+
+QDF_STATUS (*extract_bcnflt_stats)(wmi_unified_t wmi_handle, void *evt_buf,
+			 uint32_t index, wmi_host_bcnflt_stats *bcnflt_stats);
+
+QDF_STATUS (*extract_peer_extd_stats)(wmi_unified_t wmi_handle, void *evt_buf,
+		 uint32_t index, wmi_host_peer_extd_stats *peer_extd_stats);
+
+QDF_STATUS (*extract_chan_stats)(wmi_unified_t wmi_handle, void *evt_buf,
+			 uint32_t index, wmi_host_chan_stats *chan_stats);
+
+QDF_STATUS (*extract_thermal_stats)(wmi_unified_t wmi_handle, void *evt_buf,
+	uint32_t *temp, uint32_t *level);
+
+QDF_STATUS (*extract_thermal_level_stats)(wmi_unified_t wmi_handle,
+		void *evt_buf, uint8_t idx, uint32_t *levelcount,
+		uint32_t *dccount);
+
+QDF_STATUS (*extract_profile_ctx)(wmi_unified_t wmi_handle, void *evt_buf,
+				   wmi_host_wlan_profile_ctx_t *profile_ctx);
+
+QDF_STATUS (*extract_profile_data)(wmi_unified_t wmi_handle, void *evt_buf,
+				  wmi_host_wlan_profile_t *profile_data);
+
+QDF_STATUS (*extract_chan_info_event)(wmi_unified_t wmi_handle, void *evt_buf,
+				   wmi_host_chan_info_event *chan_info);
+
+QDF_STATUS (*extract_channel_hopping_event)(wmi_unified_t wmi_handle,
+		void *evt_buf,
+		wmi_host_pdev_channel_hopping_event *ch_hopping);
+
+QDF_STATUS (*extract_bss_chan_info_event)(wmi_unified_t wmi_handle,
+		void *evt_buf,
+		wmi_host_pdev_bss_chan_info_event *bss_chan_info);
+
+QDF_STATUS (*extract_inst_rssi_stats_event)(wmi_unified_t wmi_handle,
+		void *evt_buf, wmi_host_inst_stats_resp *inst_rssi_resp);
+
+QDF_STATUS (*extract_tx_data_traffic_ctrl_ev)(wmi_unified_t wmi_handle,
+		void *evt_buf, wmi_host_tx_data_traffic_ctrl_event *ev);
+
+QDF_STATUS (*extract_vdev_extd_stats)(wmi_unified_t wmi_handle, void *evt_buf,
+		uint32_t index, wmi_host_vdev_extd_stats *vdev_extd_stats);
+};
+
+struct target_abi_version {
+	A_UINT32 abi_version_0;
+	/** WMI Major and Minor versions */
+	A_UINT32 abi_version_1;
+	/** WMI change revision */
+	A_UINT32 abi_version_ns_0;
+	/** ABI version namespace first four dwords */
+	A_UINT32 abi_version_ns_1;
+	/** ABI version namespace second four dwords */
+	A_UINT32 abi_version_ns_2;
+	/** ABI version namespace third four dwords */
+	A_UINT32 abi_version_ns_3;
+	/** ABI version namespace fourth four dwords */
 };
 
 /**
@@ -601,7 +1047,7 @@
 };
 
 struct wmi_unified {
-	ol_scn_t scn_handle;    /* handle to device */
+	void *scn_handle;    /* handle to device */
 	osdev_t  osdev; /* handle to use OS-independent services */
 	qdf_atomic_t pending_cmds;
 	HTC_ENDPOINT_ID wmi_endpoint_id;
@@ -615,8 +1061,10 @@
 	qdf_nbuf_queue_t event_queue;
 	struct work_struct rx_event_work;
 	int wmi_stop_in_progress;
+#ifndef WMI_NON_TLV_SUPPORT
 	struct _wmi_abi_version fw_abi_version;
 	struct _wmi_abi_version final_abi_vers;
+#endif
 	struct wmi_cmd_init saved_wmi_init_cmd;
 	uint32_t num_of_diag_events_logs;
 	uint32_t *events_logs_list;
@@ -636,14 +1084,27 @@
 	qdf_atomic_t runtime_pm_inprogress;
 #endif
 
+	enum wmi_target_type target_type;
 	struct wmi_rx_ops rx_ops;
 	struct wmi_ops *ops;
-	void *event_handler_cookie[WMI_UNIFIED_MAX_EVENT];
 	bool use_cookie;
+	bool wmi_stopinprogress;
 	qdf_spinlock_t ctx_lock;
+#ifdef WMI_TLV_AND_NON_TLV_SUPPORT
+	/* WMI service bitmap recieved from target */
+	uint32_t wmi_service_bitmap[wmi_services_max];
+	uint32_t wmi_events[wmi_events_max];
+	uint32_t pdev_param[wmi_pdev_param_max];
+	uint32_t vdev_param[wmi_vdev_param_max];
+	uint32_t services[wmi_services_max];
+#endif
 };
-struct wmi_ops *wmi_get_tlv_ops(void);
-struct wmi_ops *wmi_get_non_tlv_ops(void);
+#ifdef WMI_NON_TLV_SUPPORT
+#define wmi_tlv_attach(x) qdf_print("TLV Unavailable\n")
+#else
+void wmi_tlv_attach(wmi_unified_t wmi_handle);
+#endif
+void wmi_non_tlv_attach(wmi_unified_t wmi_handle);
 
 /**
  * wmi_align() - provides word aligned parameter