wlan: Make API changes in sync with rel/2.0
To make all the API changes in sync with rel/2.0
Change-Id: I44b8e438d7124451ffcae7b458602cc599aa55d5
diff --git a/riva/inc/wlan_hal_msg.h b/riva/inc/wlan_hal_msg.h
old mode 100755
new mode 100644
index f888250..f29aaf6
--- a/riva/inc/wlan_hal_msg.h
+++ b/riva/inc/wlan_hal_msg.h
@@ -54,7 +54,7 @@
All values are in the range 0..255 (ie they are 8-bit values)
---------------------------------------------------------------------------*/
#define WLAN_HAL_VER_MAJOR 1
-#define WLAN_HAL_VER_MINOR 3
+#define WLAN_HAL_VER_MINOR 4
#define WLAN_HAL_VER_VERSION 1
#define WLAN_HAL_VER_REVISION 2
@@ -351,6 +351,7 @@
WLAN_HAL_UPDATE_VHT_OP_MODE_REQ = 182,
WLAN_HAL_UPDATE_VHT_OP_MODE_RSP = 183,
+
WLAN_HAL_P2P_NOA_START_IND = 184,
WLAN_HAL_GET_ROAM_RSSI_REQ = 185,
@@ -358,7 +359,10 @@
WLAN_HAL_CLASS_B_STATS_IND = 187,
WLAN_HAL_DEL_BA_IND = 188,
- WLAN_HAL_MSG_MAX = WLAN_HAL_MSG_TYPE_MAX_ENUM_SIZE
+ WLAN_HAL_DHCP_START_IND = 189,
+ WLAN_HAL_DHCP_STOP_IND = 190,
+
+ WLAN_HAL_MSG_MAX = WLAN_HAL_MSG_TYPE_MAX_ENUM_SIZE
}tHalHostMsgType;
/* Enumeration for Version */
@@ -366,7 +370,8 @@
{
WLAN_HAL_MSG_VERSION0 = 0,
WLAN_HAL_MSG_VERSION1 = 1,
- WLAN_HAL_MSG_VERSION_MAX_FIELD = 0x7FFF /*define as 2 bytes data*/
+ WLAN_HAL_MSG_WCNSS_CTRL_VERSION = 0x7FFF, /*define as 2 bytes data*/
+ WLAN_HAL_MSG_VERSION_MAX_FIELD = WLAN_HAL_MSG_WCNSS_CTRL_VERSION
}tHalHostMsgVersion;
/* Enumeration for Boolean - False/True, On/Off */
@@ -1435,12 +1440,12 @@
tANI_U8 vhtTxBFEnabled:1;
tANI_U8 reserved:5;
- /*These rates are the intersection of peer and self capabilities.*/
+ /*These rates are the intersection of peer and self capabilities.*/
tSirSupportedRates_V1 supportedRates;
tANI_U8 vhtCapable;
tANI_U8 vhtTxChannelWidthSet;
-
+
} tConfigStaParams_V1, *tpConfigStaParams_V1;
typedef PACKED_PRE struct PACKED_POST
@@ -2100,6 +2105,13 @@
tSetBssKeyParams setBssKeyParams;
} tSetBssKeyReqMsg, *tpSetBssKeyReqMsg;
+/* tagged version of set bss key */
+typedef PACKED_PRE struct PACKED_POST
+{
+ tSetBssKeyReqMsg Msg;
+ uint32 Tag;
+} tSetBssKeyReqMsgTagged;
+
/*---------------------------------------------------------------------------
WLAN_HAL_SET_BSSKEY_RSP
---------------------------------------------------------------------------*/
@@ -3092,45 +3104,6 @@
tSetKeyDoneParams setKeyDoneParams;
} tSetKeyDoneMsg, *tpSetKeyDoneMsg;
-typedef PACKED_PRE struct PACKED_POST
-{
- uint8 selfStaIdx;
- uint8 peerStaIdx;
- boolean frameSentForStart;
- boolean frameSuccessfullySent;
-
-} tScanTxBdCompParams, *tpScanTxBdCompParams;
-
-
-typedef PACKED_PRE struct PACKED_POST
-{
- tHalMsgHeader header;
- tScanTxBdCompParams scanTxBdCompleteIndParams;
-} tScanTxBdCompleteInd, *tpScanTxBdCompleteInd;
-
-typedef PACKED_PRE struct PACKED_POST
-{
- tHalMsgHeader header;
- tANI_U32 mode;
- tANI_U32 parameter;
-} tCoexOpModeType, *tpCoexOpModeType;
-
-
-typedef PACKED_PRE struct PACKED_POST
-{
- tHalMsgHeader header;
- tANI_U32 bssIdx:8;
- tANI_U32 timerType:3;
- tANI_U32 reserved:21;
-} tPwrSaveModeTOReqType, *tpPwrSaveModeTOReqType;
-
-
-typedef PACKED_PRE struct PACKED_POST
-{
- tHalMsgHeader header;
-} tTxBpsReqType, *tpTxBpsReqType;
-
-
/*---------------------------------------------------------------------------
* WLAN_HAL_DOWNLOAD_NV_REQ
*--------------------------------------------------------------------------*/
@@ -3680,6 +3653,20 @@
} tHalExitBmpsReqMsg, *tpHalExitBmpsReqMsg;
/*---------------------------------------------------------------------------
+ * WLAN_HAL_MISSED_BEACON_IND
+ *--------------------------------------------------------------------------*/
+typedef PACKED_PRE struct PACKED_POST
+{
+ tANI_U8 bssIdx;
+} tHalMissedBeaconIndParams, *tpHalMissedBeaconIndParams;
+
+typedef PACKED_PRE struct PACKED_POST
+{
+ tHalMsgHeader header;
+ tHalMissedBeaconIndParams missedBeaconIndParams;
+} tHalMissedBeaconIndMsg, *tpHalMissedBeaconIndMsg;
+
+/*---------------------------------------------------------------------------
* WLAN_HAL_ADD_BCN_FILTER_REQ
*--------------------------------------------------------------------------*/
/* Beacon Filtering data structures */
@@ -3756,6 +3743,7 @@
tANI_U8 targetIPv6Addr2Valid : 1;
tANI_U8 reserved1 : 5;
tANI_U8 reserved2; //make it DWORD aligned
+ tANI_U32 slotIndex; // slot index for this offload
tANI_U8 bssIdx;
} tHalNSOffloadParams;
@@ -3826,7 +3814,7 @@
{
tHalMsgHeader header;
tHalRSSIThresholds rssiThreshParams;
-} tHalRSSIThresholdsReqMsg, *tpHalRSSIThresholdReqMsg;
+} tHalRSSIThresholdReqMsg, *tpHalRSSIThresholdReqMsg;
/*---------------------------------------------------------------------------
* WLAN_HAL_ENTER_UAPSD_REQ
@@ -5590,6 +5578,8 @@
#define IS_MCC_SUPPORTED_BY_HOST (!!(halMsg_GetHostWlanFeatCaps(MCC)))
#define IS_SLM_SESSIONIZATION_SUPPORTED_BY_HOST (!!(halMsg_GetHostWlanFeatCaps(SLM_SESSIONIZATION)))
#define IS_FEATURE_SUPPORTED_BY_HOST(featEnumValue) (!!halMsg_GetHostWlanFeatCaps(featEnumValue))
+#define IS_WLANACTIVE_OFFLOAD_SUPPORTED_BY_HOST (!!(halMsg_GetHostWlanFeatCaps(WLANACTIVE_OFFLOAD)))
+
tANI_U8 halMsg_GetHostWlanFeatCaps(tANI_U8 feat_enum_value);
#define setFeatCaps(a,b) { tANI_U32 arr_index, bit_index; \
@@ -5697,6 +5687,8 @@
#define WLAN_HAL_GTK_OFFLOAD_FLAGS_DISABLE (1 << 0)
+#define GTK_SET_BSS_KEY_TAG 0x1234AA55
+
typedef PACKED_PRE struct PACKED_POST
{
tANI_U32 ulFlags; /* optional flags */
@@ -5763,6 +5755,22 @@
tHalGtkOffloadGetInfoRspParams gtkOffloadGetInfoRspParams;
} tHalGtkOffloadGetInfoRspMsg, *tpHalGtkOffloadGetInfoRspMsg;
+/*---------------------------------------------------------------------------
+* WLAN_HAL_DHCP_IND
+*--------------------------------------------------------------------------*/
+typedef PACKED_PRE struct PACKED_POST
+{
+ /*Indicates the device mode which indicates about the DHCP activity */
+ tANI_U8 device_mode;
+ tSirMacAddr macAddr;
+} tDHCPInfo, *tpDHCPInfo;
+
+typedef PACKED_PRE struct PACKED_POST
+{
+ tHalMsgHeader header;
+ tANI_U32 status; /* success or failure */
+} tDHCPIndStatus, *tpDHCPIndstatus;
+
/*
Thermal Mitigation mode of operation.
HAL_THERMAL_MITIGATION_MODE_0 - Based on AMPDU disabling aggregation
diff --git a/riva/inc/wlan_nv.h b/riva/inc/wlan_nv.h
index cb29530..dc765ef 100755
--- a/riva/inc/wlan_nv.h
+++ b/riva/inc/wlan_nv.h
@@ -377,11 +377,6 @@
#define HW_VAL_VALUES_VALID_CUSTOM_TCXO_REG9_MASK 0x20
-#define HAL_PWR_SAVE_FW_BMPS_SLEEP_TIME_OVERHEADS_US 1400 //(2.4Ghz operation)
-#define HAL_PWR_SAVE_FW_BMPS_SLEEP_TIME_OVERHEADS_5GHZ_US 1400 //(5Ghz operation)
-#define HAL_PWR_SAVE_FW_BMPS_SLEEP_TIME_OVERHEADS_XPA_US 1600 //(xLNA operation)
-
-
//From wlanfw/inc/halPhyCalMemory.h
typedef PACKED_PRE struct PACKED_POST
{
diff --git a/riva/inc/wlan_qct_dev_defs.h b/riva/inc/wlan_qct_dev_defs.h
index 7a183cd..b9577e6 100644
--- a/riva/inc/wlan_qct_dev_defs.h
+++ b/riva/inc/wlan_qct_dev_defs.h
@@ -60,20 +60,14 @@
#ifdef WCN_PRONTO
#ifdef WLAN_SOFTAP_VSTA_FEATURE
-#define HAL_NUM_ASSOC_STA 16
-#define HAL_NUM_STA 18
+#define HAL_NUM_ASSOC_STA 16 // HAL_NUM_STA - No of GP STAs - 2 (1 self Sta + 1 Bcast Sta)
+#define HAL_NUM_STA 20
#define HAL_NUM_HW_STA 10
#define HAL_NUM_GPSTA 2
#define HAL_NUM_UMA_DESC_ENTRIES HAL_NUM_HW_STA // or HAL_NUM_STA
-#ifdef WCN_PRONTO_V1
#define HAL_NUM_BSSID 2
#define HAL_NUM_STA_WITHOUT_VSTA 9
-#else /* WCN_PRONTO_V1 */
-#define HAL_NUM_BSSID 4
-#define HAL_NUM_STA_WITHOUT_VSTA 14
-#endif
-
#define HAL_NUM_VSTA (HAL_NUM_STA - HAL_NUM_HW_STA)
#define QWLANFW_MAX_NUM_VSTA (HAL_NUM_VSTA)