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

Commit 3dd0f9d4 authored by spuligil's avatar spuligil
Browse files

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

Change-Id: If3ba1ca92240429f2d96e661c096dd3f8e3745c9
WMI: fix incorrect TLV addition in PEER_CFR_CAPTURE_CMD msg
CRs-Fixed: 2262693
parent d5fa8492

fw/wmi_tlv_defs.h

+19 −3
Original line number Diff line number Diff line
@@ -4014,8 +4014,23 @@ WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_OBSS_PD_SPATIAL_REUSE_CMDID); 


/* Peer CFR capture cmd */

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

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_peer_cfr_capture_cmd_fixed_param, wmi_peer_cfr_capture_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_peer_cfr_capture_event_phase_fixed_param, wmi_peer_cfr_capture_event_phase_fixed_param, phase_param, WMITLV_SIZE_FIX)

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_peer_cfr_capture_cmd_fixed_param, wmi_peer_cfr_capture_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)

/*

 * NOTE: from approximately 7/25/19 to 8/16/19, the below TLV was incorrectly

 * added to this WMI_PEER_CFR_CAPTURE_CMDID message.

 * Any targets compiled with these versions of the WMI definitions will

 * expect that if there is a 2nd TLV in the WMI_PEER_CFR_CAPTURE_CMDID,

 * it will be

 * WMITLV_TAG_STRUC_wmi_peer_cfr_capture_event_phase_fixed_param

 * If in the future a new 2nd TLV is added to this WMI_PEER_CFR_CAPTURE_CMDID

 * message, that would cause a target compiled with the erroneous old

 * definitions to reject the WMI_PEER_CFR_CAPTURE_CMDID message containing

 * the new 2nd TLV, because it would not match the

 * WMITLV_TAG_STRUC_wmi_peer_cfr_capture_event_phase_fixed_param

 * tag expected by the old target.

 *

 *  WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_peer_cfr_capture_event_phase_fixed_param, wmi_peer_cfr_capture_event_phase_fixed_param, phase_param, WMITLV_SIZE_FIX)

 */

WMITLV_CREATE_PARAM_STRUC(WMI_PEER_CFR_CAPTURE_CMDID);



/* CHANNEL WIDTH SWITCH commands for peers. */
@@ -5486,7 +5501,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_ESP_ESTIMATE_EVENTID); 


/* Peer CFR capture event */

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

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_peer_cfr_capture_event_fixed_param, wmi_peer_cfr_capture_event_fixed_param, fixed_param, WMITLV_SIZE_FIX)

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_peer_cfr_capture_event_fixed_param, wmi_peer_cfr_capture_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_peer_cfr_capture_event_phase_fixed_param, wmi_peer_cfr_capture_event_phase_fixed_param, phase_param, WMITLV_SIZE_FIX)

WMITLV_CREATE_PARAM_STRUC(WMI_PEER_CFR_CAPTURE_EVENTID);



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

fw/wmi_unified.h

+4 −0
Original line number Diff line number Diff line
@@ -27345,6 +27345,10 @@ typedef struct { 
#define WMI_PEER_CFR_CAPTURE_EVT_STATUS_OK      0x80000000

#define WMI_PEER_CFR_CAPTURE_EVT_STATUS_OK_S    31









/* Failed to capture CFR as peer is in power save mode */









#define WMI_PEER_CFR_CAPTURE_EVT_STATUS_PS_FAILED      0x40000000









#define WMI_PEER_CFR_CAPTURE_EVT_STATUS_PS_FAILED_S    30

















#define WMI_PEER_CFR_CAPTURE_EVT_STATUS_TX      0x00000003









#define WMI_PEER_CFR_CAPTURE_EVT_STATUS_TX_S    0

































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_ 710









#define __WMI_REVISION_ 711



















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









 *  host and firmware of the same WMI namespace will work