Переглянути джерело

qcacmn: Cleanup fw_abi_version handling in WMI

fw_abi_version is used in WMI to check compatabilty of host and target
WMI interface. Cleanup handling to fw_abi_version.

Change-Id: Ia78c4683b9eff06d3c052df3921c024962abd828
CRs-Fixed: 2131311
Kiran Venkatappa 7 роки тому
батько
коміт
153c835f05
1 змінених файлів з 19 додано та 19 видалено
  1. 19 19
      wmi_unified_priv.h

+ 19 - 19
wmi_unified_priv.h

@@ -1390,21 +1390,6 @@ QDF_STATUS (*send_limit_off_chan_cmd)(wmi_unified_t wmi_handle,
 		struct wmi_limit_off_chan_param *limit_off_chan_param);
 };
 
-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 */
-};
-
 /* Forward declartion for psoc*/
 struct wlan_objmgr_psoc;
 
@@ -1418,6 +1403,23 @@ struct wmi_cmd_init {
 	uint32_t buf_len;
 };
 
+/**
+ * @abi_version_0: WMI Major and Minor versions
+ * @abi_version_1: WMI change revision
+ * @abi_version_ns_0: ABI version namespace first four dwords
+ * @abi_version_ns_1: ABI version namespace second four dwords
+ * @abi_version_ns_2: ABI version namespace third four dwords
+ * @abi_version_ns_3: ABI version namespace fourth four dwords
+ */
+struct wmi_host_abi_version {
+	uint32_t abi_version_0;
+	uint32_t abi_version_1;
+	uint32_t abi_version_ns_0;
+	uint32_t abi_version_ns_1;
+	uint32_t abi_version_ns_2;
+	uint32_t abi_version_ns_3;
+};
+
 struct wmi_unified {
 	void *scn_handle;    /* handle to device */
 	osdev_t  osdev; /* handle to use OS-independent services */
@@ -1433,10 +1435,8 @@ struct wmi_unified {
 	qdf_work_t rx_event_work;
 	qdf_workqueue_t *wmi_rx_work_queue;
 	int wmi_stop_in_progress;
-#ifdef CONFIG_MCL
-	struct _wmi_abi_version fw_abi_version;
-	struct _wmi_abi_version final_abi_vers;
-#endif
+	struct wmi_host_abi_version fw_abi_version;
+	struct wmi_host_abi_version final_abi_vers;
 	struct wmi_cmd_init saved_wmi_init_cmd;
 	uint32_t num_of_diag_events_logs;
 	uint32_t *events_logs_list;