浏览代码

qcacmn: Adapt WIN driver with FW abstraction changes

Recently added changes for coexistence of WIN/MCL TLV implementation
through CL I6868c288a43fd3afb19c84b8a9d4ef0dfbee5c94 require
adaptations in QCA WIN driver to successfully compile.

Add required definitions in WMI layer to adapt WIN driver to
changes made for coexistence.

Change-Id: I99550ca10553d8096b8967249c006bac4e0c62df
Sathish Kumar 8 年之前
父节点
当前提交
c4218f3dea
共有 3 个文件被更改,包括 30 次插入4 次删除
  1. 2 2
      wmi/inc/wmi_unified_non_tlv.h
  2. 24 0
      wmi/inc/wmi_unified_param.h
  3. 4 2
      wmi/src/wmi_unified_non_tlv.c

+ 2 - 2
wmi/inc/wmi_unified_non_tlv.h

@@ -28,8 +28,8 @@
 #include <osdep.h>
 #include "a_types.h"
 #include "wmi_unified_param.h"
-#include "legacy/wmi.h"
-#include "legacy/wmi_unified.h"
+#include "wmi.h"
+#include "wmi_unified.h"
 #include "ol_defines.h" /* Fix Me: wmi_unified_t structure definition */
 
 QDF_STATUS send_vdev_create_cmd_non_tlv(wmi_unified_t wmi_handle,

+ 24 - 0
wmi/inc/wmi_unified_param.h

@@ -277,6 +277,29 @@ typedef enum {
 	WMI_HOST_MODE_MAX	= 16
 } WMI_HOST_WLAN_PHY_MODE;
 
+typedef enum {
+	WMI_HOST_VDEV_START_OK = 0,
+	WMI_HOST_VDEV_START_CHAN_INVALID,
+} WMI_HOST_VDEV_START_STATUS;
+
+/*
+ * Needs to be removed and use channel_param based
+ * on how it is processed
+ */
+typedef struct {
+	/** primary 20 MHz channel frequency in mhz */
+	uint32_t mhz;
+	/** Center frequency 1 in MHz*/
+	uint32_t band_center_freq1;
+	/** Center frequency 2 in MHz - valid only for 11acvht 80plus80 mode*/
+	uint32_t band_center_freq2;
+	/** channel info described below */
+	uint32_t info;
+	/** contains min power, max power, reg power and reg class id.  */
+	uint32_t reg_info_1;
+	/** contains antennamax */
+	uint32_t reg_info_2;
+} wmi_host_channel;
 
 /**
  * enum wmi_dwelltime_adaptive_mode: dwelltime_mode
@@ -5412,6 +5435,7 @@ enum wmi_host_scan_event_type {
 	WMI_HOST_SCAN_EVENT_RESTARTED = 0x80,
 	WMI_HOST_SCAN_EVENT_FOREIGN_CHANNEL_EXIT = 0x100,
 	WMI_HOST_SCAN_EVENT_INVALID = 0x200,
+	WMI_HOST_SCAN_EVENT_GPIO_TIMEOUT = 0x400,
 	WMI_HOST_SCAN_EVENT_MAX = 0x8000
 };
 

+ 4 - 2
wmi/src/wmi_unified_non_tlv.c

@@ -36,8 +36,8 @@
 #include "wmi_unified_priv.h"
 
 #if defined(WMI_NON_TLV_SUPPORT) || defined(WMI_TLV_AND_NON_TLV_SUPPORT)
-#include "legacy/wmi.h"
-#include "legacy/wmi_unified.h"
+#include "wmi.h"
+#include "wmi_unified.h"
 /**
  * send_vdev_create_cmd_non_tlv() - send VDEV create command to fw
  * @wmi_handle: wmi handle
@@ -8108,6 +8108,8 @@ static void populate_vdev_param_non_tlv(uint32_t *vdev_param)
 	vdev_param[wmi_vdev_param_dtim_enable_cts] =
 		WMI_VDEV_PARAM_DTIM_ENABLE_CTS;
 	vdev_param[wmi_vdev_param_sta_kickout] = WMI_VDEV_PARAM_STA_KICKOUT;
+	vdev_param[wmi_vdev_param_capabilities] =
+		WMI_VDEV_PARAM_CAPABILITIES;
 }
 #endif