qcacmn: Enable converged scan component

Update WMI layer to adopt to converged scan module
and enable converged scan component init/deinit

Change-Id: I4f9da95f90f737ac8bdcaa54f9eb4e154f37d3de
CRs-Fixed: 1095299

target_if/core/src/target_if_main.c

@@ -29,6 +29,7 @@
 #include "target_if_atf.h"
 #endif
 #include <target_if_reg.h>
+#include <target_if_scan.h>
 
 #ifdef CONVERGED_P2P_ENABLE
 #include "target_if_p2p.h"
@@ -141,6 +142,9 @@ QDF_STATUS target_if_register_umac_tx_ops(struct wlan_lmac_if_tx_ops *tx_ops)
 	/* call umac callback to register legacy tx ops */
 	wlan_lmac_if_umac_tx_ops_register(tx_ops);
 
+	/* Register scan tx ops */
+	target_if_register_scan_tx_ops(&tx_ops->scan);
+
 	target_if_atf_tx_ops_register(tx_ops);
 
 	target_if_wifi_pos_tx_ops_register(tx_ops);
@@ -183,6 +187,7 @@ QDF_STATUS target_if_register_tx_ops(struct wlan_lmac_if_tx_ops *tx_ops)
 {
 	/* Converged UMAC components to register their TX-ops */
 	target_if_register_umac_tx_ops(tx_ops);
+
 	/* Components parallel to UMAC to register their TX-ops here */
 	target_if_pmo_register_tx_ops_req(tx_ops);
 

target_if/scan/src/target_if_scan.c

@@ -73,10 +73,17 @@ target_if_scan_event_handler(ol_scn_t scn, uint8_t *data, uint32_t datalen)
 	event_info = qdf_mem_malloc(sizeof(*event_info));
 
 	if (!event_info) {
-		target_if_err("%s: unable to allocate scan_event\n", __func__);
+		target_if_err("unable to allocate scan_event");
 		return -ENOMEM;
 	}
 
+	if (wmi_extract_vdev_scan_ev_param(wmi_handle, data,
+	   &(event_info->event))) {
+		target_if_err("Failed to extract wmi scan event");
+		qdf_mem_free(event_info);
+		return -EINVAL;
+	}
+
 #ifdef CONFIG_MCL
 	/* temp change for p2p ROC*/
 #define ROC_SCAN_REQUESTOR_ID   0xB000
@@ -124,14 +131,15 @@ QDF_STATUS
 target_if_scan_start(struct wlan_objmgr_psoc *psoc,
 		struct scan_start_request *req)
 {
-	return QDF_STATUS_SUCCESS;
+	return wmi_unified_scan_start_cmd_send(psoc->tgt_if_handle,
+		&req->scan_req);
 }
 
 QDF_STATUS
 target_if_scan_cancel(struct wlan_objmgr_psoc *psoc,
 		struct scan_cancel_param *req)
 {
-	return QDF_STATUS_SUCCESS;
+	return wmi_unified_scan_stop_cmd_send(psoc->tgt_if_handle, req);
 }
 
 QDF_STATUS