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

Commit 8d32e069 authored by spuligil's avatar spuligil
Browse files

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

WMI: add legacy MCS,GI spec to peer_cfr_capture_event msg
Also, piggyback the fix to change WMI_SCAN_FLAG_EXT_FORCE_UNICAST_RA to non-conflicting value.

Change-Id: Iff78c7ba7e6298b12abf3323435690e5403c06d5
CRs-Fixed: 2262693
parent dcedaba0
Loading
Loading
Loading
Loading
+42 −3
Original line number Diff line number Diff line
@@ -4631,9 +4631,6 @@ typedef enum {
/* Extend 6ghz channel measure time */
#define WMI_SCAN_FLAG_EXT_6GHZ_EXTEND_MEASURE_TIME    0x00000400
/* Force unicast address in RA */
#define WMI_SCAN_FLAG_EXT_FORCE_UNICAST_RA            0x00000800
/**
 * Currently passive scan has higher priority than beacon and
 * beacon miss would happen irrespective of dwell time.
@@ -4643,6 +4640,9 @@ typedef enum {
 */
#define WMI_SCAN_FLAG_EXT_PASSIVE_SCAN_START_TIME_ENHANCE   0x00000800
/* Force unicast address in RA */
#define WMI_SCAN_FLAG_EXT_FORCE_UNICAST_RA            0x00001000
/**
 * new 6 GHz flags per chan (short ssid or bssid) in struct
 * wmi_hint_freq_short_ssid or wmi_hint_freq_bssid
@@ -32385,8 +32385,47 @@ typedef struct {
     * The rx_ts_reset flag will be set to 1 upon every reset of rx_start_ts.
     */
    A_UINT32 rx_ts_reset;
    /*
     * MCS and Guard Interval.
     * MCS: For legacy mode only
     *    0: 48 Mbps
     *    1: 24 Mbps
     *    2: 12 Mbps
     *    3: 6 Mbps
     *    4: 54 Mbps
     *    5: 36 Mbps
     *    6: 18 Mbps
     *    7: 9 Mbps
     *    8: invalid entry
     *
     * GI: For Legacy mode only
     *    0: 0.8 us
     *    1: 0.4 us
     *    2: 1.6 us
     *    3: 3.2 us
     *    4: invalid entry
     *
     * Bits 0:3        mcs
     * Bits 4:6        gi_type
     * Bits 7:31       reserved
     */
    A_UINT32 mcs_gi_info;
} wmi_peer_cfr_capture_event_fixed_param;
#define WMI_CFR_MCS_GET(mcs_gi_info) \
        WMI_GET_BITS(mcs_gi_info, 0, 4)
#define WMI_CFR_MCS_SET(mcs_gi_info, value) \
        WMI_SET_BITS(mcs_gi_info, 0, 4, value)
#define WMI_CFR_GI_TYPE_GET(mcs_gi_info) \
        WMI_GET_BITS(mcs_gi_info, 4, 3)
#define WMI_CFR_GI_TYPE_SET(mcs_gi_info, value) \
        WMI_SET_BITS(mcs_gi_info, 4, 3, value)
#define WMI_UNIFIED_CHAIN_PHASE_MASK 0x0000ffff
#define WMI_UNIFIED_CHAIN_PHASE_GET(tlv, chain_idx) \
    ((A_UINT16) ((tlv)->chain_phase[chain_idx] & WMI_UNIFIED_CHAIN_PHASE_MASK))
+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_ 990
#define __WMI_REVISION_ 991

/** The Version Namespace should not be normally changed. Only
 *  host and firmware of the same WMI namespace will work