qcacld-3.0: CL 1413998 - update fw common interface files

qcacld-2.0 to qcacld-3.0 propagation

Add new RTT related wmi interface changes to support
TLV based messaging.

Change-Id: I0591907984c3c58039a06ce123dca777d24c590f
CRs-Fixed: 865207

core/wmi/wmi_unified.c

@@ -605,6 +605,7 @@ static uint8_t *get_wmi_cmd_string(WMI_CMD_ID wmi_command)
 		CASE_RETURN_STRING(WMI_BATCH_SCAN_TRIGGER_RESULT_CMDID);
 		/* OEM related cmd */
 		CASE_RETURN_STRING(WMI_OEM_REQ_CMDID);
+		CASE_RETURN_STRING(WMI_OEM_REQUEST_CMDID);
 		/* NAN request cmd */
 		CASE_RETURN_STRING(WMI_NAN_CMDID);
 		/* Modem power state cmd */

target/inc/wmi_tlv_defs.h

@@ -840,7 +840,8 @@ typedef enum {
 	OP(WMI_WOW_HOSTWAKEUP_GPIO_PIN_PATTERN_CONFIG_CMDID) \
 	OP(WMI_AP_PS_EGAP_PARAM_CMDID) \
 	OP(WMI_PMF_OFFLOAD_SET_SA_QUERY_CMDID) \
-	OP(WMI_TRANSFER_DATA_TO_FLASH_CMDID)
+	OP(WMI_TRANSFER_DATA_TO_FLASH_CMDID) \
+	OP(WMI_OEM_REQUEST_CMDID)
 /*
  * IMPORTANT: Please add _ALL_ WMI Events Here.
  * Otherwise, these WMI TLV Functions will be process them.
@@ -956,7 +957,8 @@ typedef enum {
 	OP(WMI_MAWC_ENABLE_SENSOR_EVENTID) \
 	OP(WMI_PEER_ASSOC_CONF_EVENTID) \
 	OP(WMI_AP_PS_EGAP_INFO_EVENTID) \
-	OP(WMI_TRANSFER_DATA_TO_FLASH_COMPLETE_EVENTID)
+	OP(WMI_TRANSFER_DATA_TO_FLASH_COMPLETE_EVENTID) \
+	OP(WMI_OEM_RESPONSE_EVENTID)
 
 /* TLV definitions of WMI commands */
 
@@ -1413,12 +1415,17 @@ WMITLV_CREATE_PARAM_STRUC(WMI_RTT_MEASREQ_CMDID);
 	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, data, WMITLV_SIZE_VAR)
 WMITLV_CREATE_PARAM_STRUC(WMI_RTT_TSF_CMDID);
 
-/*RTT OEM req Cmd */
+/*RTT OEM req Cmd - DEPRECATED */
 #define WMITLV_TABLE_WMI_OEM_REQ_CMDID(id,op,buf,len) \
 	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, data, WMITLV_SIZE_VAR)
 
 WMITLV_CREATE_PARAM_STRUC(WMI_OEM_REQ_CMDID);
 
+/* RTT OEM request Cmd */
+#define WMITLV_TABLE_WMI_OEM_REQUEST_CMDID(id, op, buf, len) \
+	WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, data, WMITLV_SIZE_VAR)
+WMITLV_CREATE_PARAM_STRUC(WMI_OEM_REQUEST_CMDID);
+
 /* Spectral scan configure Cmd */
 #define WMITLV_TABLE_WMI_VDEV_SPECTRAL_SCAN_CONFIGURE_CMDID(id,op,buf,len) \
 	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vdev_spectral_configure_cmd_fixed_param, wmi_vdev_spectral_configure_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
@@ -2661,26 +2668,31 @@ WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_UTF_EVENTID);
 	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, data, WMITLV_SIZE_VAR)
 WMITLV_CREATE_PARAM_STRUC(WMI_DEBUG_PRINT_EVENTID);
 
-/* RTT measurement report Event */
+/* RTT measurement report Event - DEPRECATED */
 #define WMITLV_TABLE_WMI_RTT_MEASUREMENT_REPORT_EVENTID(id,op,buf,len) \
 	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, data, WMITLV_SIZE_VAR)
 WMITLV_CREATE_PARAM_STRUC(WMI_RTT_MEASUREMENT_REPORT_EVENTID);
 
-/*oem measurement report Event*/
+/* oem measurement report Event - DEPRECATED */
 #define WMITLV_TABLE_WMI_OEM_MEASUREMENT_REPORT_EVENTID(id,op,buf,len) \
 	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, data, WMITLV_SIZE_VAR)
 WMITLV_CREATE_PARAM_STRUC(WMI_OEM_MEASUREMENT_REPORT_EVENTID);
 
-/*oem error report event*/
+/* oem error report event - DEPRECATED */
 #define WMITLV_TABLE_WMI_OEM_ERROR_REPORT_EVENTID(id,op,buf,len) \
 	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, data, WMITLV_SIZE_VAR)
 WMITLV_CREATE_PARAM_STRUC(WMI_OEM_ERROR_REPORT_EVENTID);
 
-/*oem capability report event*/
+/* oem capability report event - DEPRECATED */
 #define WMITLV_TABLE_WMI_OEM_CAPABILITY_EVENTID(id,op,buf,len) \
 	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, data, WMITLV_SIZE_VAR)
 WMITLV_CREATE_PARAM_STRUC(WMI_OEM_CAPABILITY_EVENTID);
 
+/* oem response event */
+#define WMITLV_TABLE_WMI_OEM_RESPONSE_EVENTID(id, op, buf, len) \
+	WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, data, WMITLV_SIZE_VAR)
+WMITLV_CREATE_PARAM_STRUC(WMI_OEM_RESPONSE_EVENTID);
+
 /* HOST SWBA Event */
 #define WMITLV_TABLE_WMI_HOST_SWBA_EVENTID(id,op,buf,len) \
 	WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_host_swba_event_fixed_param, wmi_host_swba_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \

target/inc/wmi_unified.h

@@ -781,7 +781,8 @@ typedef enum {
 	/*get batch scan result */
 	WMI_BATCH_SCAN_TRIGGER_RESULT_CMDID,
 	/* OEM related cmd */
-	WMI_OEM_REQ_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_OEM),
+	WMI_OEM_REQ_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_OEM), /* DEPRECATED */
+	WMI_OEM_REQUEST_CMDID,
 
 	/** Nan Request */
 	WMI_NAN_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_NAN),
@@ -1147,9 +1148,11 @@ typedef enum {
 	/*batch scan result */
 	WMI_BATCH_SCAN_RESULT_EVENTID,
 	/* OEM Event */
-	WMI_OEM_CAPABILITY_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_OEM),
-	WMI_OEM_MEASUREMENT_REPORT_EVENTID,
-	WMI_OEM_ERROR_REPORT_EVENTID,
+	WMI_OEM_CAPABILITY_EVENTID = /* DEPRECATED */
+		WMI_EVT_GRP_START_ID(WMI_GRP_OEM),
+	WMI_OEM_MEASUREMENT_REPORT_EVENTID, /* DEPRECATED */
+	WMI_OEM_ERROR_REPORT_EVENTID, /* DEPRECATED */
+	WMI_OEM_RESPONSE_EVENTID,
 
 	/* NAN Event */
 	WMI_NAN_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_NAN),

target/inc/wmi_version.h

@@ -36,7 +36,7 @@
 #define __WMI_VER_MINOR_    0
 /** WMI revision number has to be incremented when there is a
  *  change that may or may not break compatibility */
-#define __WMI_REVISION_ 179
+#define __WMI_REVISION_ 180
 
 /** The Version Namespace should not be normally changed. Only
  *  host and firmware of the same WMI namespace will work