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

Commit a80a6124 authored by spuligil's avatar spuligil Committed by Rahul Choudhary
Browse files

fw-api: CL 23190594 - update fw common interface files 

Change-Id: I7528eaff5d06fa1775a5eb530dfaded19126fd53
WMI: add var-len data to WMI_VENDOR_* msgs, mv wmi_mac_addr def to wlan_defs.h
CRs-Fixed: 2262693
parent 44e65aa7

fw/wlan_defs.h

+7 −0
Original line number Diff line number Diff line
@@ -1849,5 +1849,12 @@ typedef struct { 
A_COMPILE_TIME_ASSERT(check_mlo_glb_h_shmem_8byte_size_quantum,

        (((sizeof(mlo_glb_h_shmem) % sizeof(A_UINT64) == 0x0))));



/** 2 word representation of MAC addr */

typedef struct _wmi_mac_addr {

    /** upper 4 bytes of  MAC address */

    A_UINT32 mac_addr31to0;

    /** lower 2 bytes of  MAC address */

    A_UINT32 mac_addr47to32;

} wmi_mac_addr;



#endif /* __WLANDEFS_H__ */

fw/wmi_tlv_defs.h

+12 −6
Original line number Diff line number Diff line
@@ -5395,13 +5395,16 @@ WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_PAUSE_CMDID); 


/* pdev,vdev,peer cmd messages for tunneling vendor-specific contents */

#define WMITLV_TABLE_WMI_VENDOR_PDEV_CMDID(id,op,buf,len) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_vendor_cmd_fixed_param, wmi_pdev_vendor_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_vendor_cmd_fixed_param, wmi_pdev_vendor_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, opaque_vendor_var_len_data, WMITLV_SIZE_VAR)

WMITLV_CREATE_PARAM_STRUC(WMI_VENDOR_PDEV_CMDID);

#define WMITLV_TABLE_WMI_VENDOR_VDEV_CMDID(id,op,buf,len) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vdev_vendor_cmd_fixed_param, wmi_vdev_vendor_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vdev_vendor_cmd_fixed_param, wmi_vdev_vendor_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, opaque_vendor_var_len_data, WMITLV_SIZE_VAR)

WMITLV_CREATE_PARAM_STRUC(WMI_VENDOR_VDEV_CMDID);

#define WMITLV_TABLE_WMI_VENDOR_PEER_CMDID(id,op,buf,len) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_peer_vendor_cmd_fixed_param, wmi_peer_vendor_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_peer_vendor_cmd_fixed_param, wmi_peer_vendor_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, opaque_vendor_var_len_data, WMITLV_SIZE_VAR)

WMITLV_CREATE_PARAM_STRUC(WMI_VENDOR_PEER_CMDID);



/* SET MLO link BSS param */
@@ -7357,13 +7360,16 @@ WMITLV_CREATE_PARAM_STRUC(WMI_MLO_LINK_DISABLE_REQUEST_EVENTID); 


/* pdev,vdev,peer event messages for tunneling vendor-specific contents */

#define WMITLV_TABLE_WMI_VENDOR_PDEV_EVENTID(id,op,buf,len) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_vendor_event_fixed_param, wmi_pdev_vendor_event_fixed_param, fixed_param, WMITLV_SIZE_FIX)

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_vendor_event_fixed_param, wmi_pdev_vendor_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, opaque_vendor_var_len_data, WMITLV_SIZE_VAR)

WMITLV_CREATE_PARAM_STRUC(WMI_VENDOR_PDEV_EVENTID);

#define WMITLV_TABLE_WMI_VENDOR_VDEV_EVENTID(id,op,buf,len) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vdev_vendor_event_fixed_param, wmi_vdev_vendor_event_fixed_param, fixed_param, WMITLV_SIZE_FIX)

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vdev_vendor_event_fixed_param, wmi_vdev_vendor_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, opaque_vendor_var_len_data, WMITLV_SIZE_VAR)

WMITLV_CREATE_PARAM_STRUC(WMI_VENDOR_VDEV_EVENTID);

#define WMITLV_TABLE_WMI_VENDOR_PEER_EVENTID(id,op,buf,len) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_peer_vendor_event_fixed_param, wmi_peer_vendor_event_fixed_param, fixed_param, WMITLV_SIZE_FIX)

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_peer_vendor_event_fixed_param, wmi_peer_vendor_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, opaque_vendor_var_len_data, WMITLV_SIZE_VAR)

WMITLV_CREATE_PARAM_STRUC(WMI_VENDOR_PEER_EVENTID);



/* link switch event */

fw/wmi_unified.h

+42 −8
Original line number Diff line number Diff line
@@ -198,14 +198,6 @@ static INLINE void wmi_packed_arr_set_bits(A_UINT32 *arr, A_UINT32 entry_index, 
        ((val & (((A_UINT32) 1 << bits_per_entry) - 1)) << start_bit_in_uint);

}













/** 2 word representation of MAC addr */













typedef struct _wmi_mac_addr {













    /** upper 4 bytes of  MAC address */













    A_UINT32 mac_addr31to0;













    /** lower 2 bytes of  MAC address */













    A_UINT32 mac_addr47to32;













} wmi_mac_addr;



























/** macro to convert MAC address from WMI word format to char array */















#define WMI_MAC_ADDR_TO_CHAR_ARRAY(pwmi_mac_addr,c_macaddr) do {        \















     (c_macaddr)[0] = (((pwmi_mac_addr)->mac_addr31to0)  >>  0) & 0xff; \










@@ -43552,6 +43544,13 @@ typedef struct wmi_pdev_vendor_event













     * because their offsets within wmi_pdev_vendor_event_fixed_param















     * would change, causing backwards incompatibilities.















     */













/*













 * This fixed_param TLV may be followed by the below TLVs:













 *   - A_UINT32 opaque_vendor_var_len_data[]:













 *     Variable-length array of opaque data.













 *     The _fixed_param.sub_type value clarifies how to interpret the













 *     contents of this opaque data.













 */















} wmi_pdev_vendor_event_fixed_param;















typedef wmi_pdev_vendor_event_fixed_param wmi_vendor_pdev_event_fixed_param;























@@ -43572,6 +43571,13 @@ typedef struct wmi_vdev_vendor_event













     * because their offsets within wmi_vdev_vendor_event_fixed_param















     * would change, causing backwards incompatibilities.















     */













/*













 * This fixed_param TLV may be followed by the below TLVs:













 *   - A_UINT32 opaque_vendor_var_len_data[]:













 *     Variable-length array of opaque data.













 *     The _fixed_param.sub_type value clarifies how to interpret the













 *     contents of this opaque data.













 */















} wmi_vdev_vendor_event_fixed_param;















typedef wmi_vdev_vendor_event_fixed_param wmi_vendor_vdev_event_fixed_param;























@@ -43594,6 +43600,13 @@ typedef struct wmi_peer_vendor_event













     * because their offsets within wmi_peer_vendor_event_fixed_param















     * would change, causing backwards incompatibilities.















     */













/*













 * This fixed_param TLV may be followed by the below TLVs:













 *   - A_UINT32 opaque_vendor_var_len_data[]:













 *     Variable-length array of opaque data.













 *     The _fixed_param.sub_type value clarifies how to interpret the













 *     contents of this opaque data.













 */















} wmi_peer_vendor_event_fixed_param;















typedef wmi_peer_vendor_event_fixed_param wmi_vendor_peer_event_fixed_param;























@@ -43612,6 +43625,13 @@ typedef struct wmi_pdev_vendor_cmd













     * because their offsets within wmi_pdev_vendor_cmd_fixed_param















     * would change, causing backwards incompatibilities.















     */













/*













 * This fixed_param TLV may be followed by the below TLVs:













 *   - A_UINT32 opaque_vendor_var_len_data[]:













 *     Variable-length array of opaque data.













 *     The _fixed_param.sub_type value clarifies how to interpret the













 *     contents of this opaque data.













 */















} wmi_pdev_vendor_cmd_fixed_param;















typedef wmi_pdev_vendor_cmd_fixed_param wmi_vendor_pdev_cmd_fixed_param;























@@ -43632,6 +43652,13 @@ typedef struct wmi_vdev_vendor_cmd













     * because their offsets within wmi_vdev_vendor_cmd_fixed_param















     * would change, causing backwards incompatibilities.















     */













/*













 * This fixed_param TLV may be followed by the below TLVs:













 *   - A_UINT32 opaque_vendor_var_len_data[]:













 *     Variable-length array of opaque data.













 *     The _fixed_param.sub_type value clarifies how to interpret the













 *     contents of this opaque data.













 */















} wmi_vdev_vendor_cmd_fixed_param;















typedef wmi_vdev_vendor_cmd_fixed_param wmi_vendor_vdev_cmd_fixed_param;























@@ -43654,6 +43681,13 @@ typedef struct wmi_peer_vendor_cmd













     * because their offsets within wmi_peer_vendor_cmd_fixed_param















     * would change, causing backwards incompatibilities.















     */













/*













 * This fixed_param TLV may be followed by the below TLVs:













 *   - A_UINT32 opaque_vendor_var_len_data[]:













 *     Variable-length array of opaque data.













 *     The _fixed_param.sub_type value clarifies how to interpret the













 *     contents of this opaque data.













 */















} wmi_peer_vendor_cmd_fixed_param;















typedef wmi_peer_vendor_cmd_fixed_param wmi_vendor_peer_cmd_fixed_param;







































fw/wmi_version.h



+1
−1




























Original line number
Diff line number
Diff line








@@ -37,7 +37,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_ 1339













#define __WMI_REVISION_ 1340































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















 *  host and firmware of the same WMI namespace will work