Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8ac6d84 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge b132b089 on remote branch 

Change-Id: I00fd7d1c3a1bea46d244a4a8d47e6cc442589e29
parents 5cb793a5 b132b089

fw/wmi_services.h

+2 −0
Original line number Diff line number Diff line
@@ -269,6 +269,8 @@ typedef enum { 
    WMI_SERVICE_PER_VDEV_CHAINMASK_CONFIG_SUPPORT=173, /* Support for configuring chainmask per VDEV */

    WMI_SERVICE_TX_DATA_MGMT_ACK_RSSI=174, /* ACK RSSI indication to host for host TX data and mgmt frame */

    WMI_SERVICE_NAN_DISABLE_SUPPORT=175, /* indicates firmware is dependent on host to disable NAN incase of concurrencies */

    WMI_SERVICE_NAN_DISABLE_SUPPORT__prototype = WMI_SERVICE_NAN_DISABLE_SUPPORT, /* alias, to clarify that NAN_DISABLE_SUPPORT is for prototype testing purposes */

    WMI_SERVICE_HTT_H2T_NO_HTC_HDR_LEN_IN_MSG_LEN=176, /* indicates FW supports uniformly excluding the HTC header length from the HTT H2T message length */



    /******* ADD NEW SERVICES HERE *******/

fw/wmi_unified.h

+32 −0
Original line number Diff line number Diff line
@@ -2856,6 +2856,20 @@ typedef struct { 
    #define WMI_RSRC_CFG_FLAG_TX_ACK_RSSI_S 18

    #define WMI_RSRC_CFG_FLAG_TX_ACK_RSSI_M 0x40000









    /*









     * If HTT_H2T_NO_HTC_HDR_LEN_IN_MSG_LEN is set, the host will not









     * include the HTC header length in the payload length for all HTT_H2T









     * messages.









     * Otherwise, only when sending HTT_H2T_MSG_TYPE_TX_FRM message,









     * payload length includes HTC header length. Other HTT_H2T messages'









     * payload length does not include HTC header length.









     * The host will only set this HTT_H2T_NO_HTC_HDR_LEN_IN_MSG_LEN flag









     * if the target has set the WMI_SERVICE_HTT_H2T_NO_HTC_HDR_LEN_IN_MSG_LEN









     * flag to indicate its support for this option.









     */









    #define WMI_RSRC_CFG_FLAG_HTT_H2T_NO_HTC_HDR_LEN_IN_MSG_LEN_S 19









    #define WMI_RSRC_CFG_FLAG_HTT_H2T_NO_HTC_HDR_LEN_IN_MSG_LEN_M 0x80000

















    A_UINT32 flag1;

















    /** @brief smart_ant_cap - Smart Antenna capabilities information








@@ -3089,6 +3103,10 @@ typedef struct {







#define WMI_RSRC_CFG_FLAG_TX_ACK_RSSI_GET(word32) \









    WMI_RSRC_CFG_FLAG_GET((word32), TX_ACK_RSSI)

















#define WMI_RSRC_CFG_FLAG_HTT_H2T_NO_HTC_HDR_LEN_IN_MSG_LEN_SET(word32, value) \









    WMI_RSRC_CFG_FLAG_SET((word32), HTT_H2T_NO_HTC_HDR_LEN_IN_MSG_LEN, (value))









#define WMI_RSRC_CFG_FLAG_HTT_H2T_NO_HTC_HDR_LEN_IN_MSG_LEN_GET(word32) \









    WMI_RSRC_CFG_FLAG_GET((word32), HTT_H2T_NO_HTC_HDR_LEN_IN_MSG_LEN)

















typedef struct {









    A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_init_cmd_fixed_param */








@@ -4568,6 +4586,14 @@ typedef struct {







    A_UINT32 rx_nss_5g;









    /* number of chains to use for 11a transmissions. Valid only in 5 GHz */









    A_UINT32 num_tx_chains_a;









    /* If non-zero then use only one chain for TX when connection tx_nss is 1 in 2.4 GHz */









    A_UINT32 disable_tx_mrc_2g;









    /* If non-zero then use only one chain for RX when connection rx_nss is 1 in 2.4 GHz */









    A_UINT32 disable_rx_mrc_2g;









    /* If non-zero then use only one chain for TX when connection tx_nss is 1 in 5 GHz */









    A_UINT32 disable_tx_mrc_5g;









    /* If non-zero then use only one chain for RX when connection rx_nss is 1 in 5 GHz */









    A_UINT32 disable_rx_mrc_5g;









} wmi_vdev_chainmask_config_cmd_fixed_param;

















/*








@@ -12688,6 +12714,12 @@ typedef struct {







    A_UINT32 interval_low; /* interval for keeping low voltage, unit: ms */









    A_UINT32 interval_high; /* interval for keeping high voltage, unit: ms */









    A_UINT32 repeat_cnt; /* repeat times for pulse (0xffffffff means forever) */









    A_UINT32 init_state; /* Sense of the GPIO pin used for host wakeups.









                          * If init_state is 0, a low --> high transition









                          * causes a host wakeup interrupt.









                          * If init_state is 1, a high --> low transition









                          * causes a host wakeup interrrupt.









                          */









} WMI_WOW_HOSTWAKEUP_GPIO_PIN_PATTERN_CONFIG_CMD_fixed_param;

















#define MAX_SUPPORTED_ACTION_CATEGORY           256

























fw/wmi_version.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -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_ 587









#define __WMI_REVISION_ 590



















/** The Version Namespace should not be normally changed. Only









 *  host and firmware of the same WMI namespace will work