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

Commit 100c793c authored by spuligil's avatar spuligil
Browse files

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

Change-Id: I301686747f6e713c1f2f52b76d95db64f701e543
WMI: add NAN_OEM_DATA CMD,EVENT msg defs
CRs-Fixed: 2262693
parent 5f497f6b

fw/wmi_tlv_defs.h

+18 −0
Original line number Diff line number Diff line
@@ -1390,6 +1390,8 @@ typedef enum { 
    WMITLV_TAG_STRUC_wmi_mlo_link_recommendation_fixed_param,

    WMITLV_TAG_STRUC_wmi_mlo_peer_recommended_links,

    WMITLV_TAG_STRUC_wmi_aux_dev_capabilities,

    WMITLV_TAG_STRUC_wmi_nan_oem_data_cmd_fixed_param,

    WMITLV_TAG_STRUC_wmi_nan_oem_data_event_fixed_param,

} WMITLV_TAG_ID;

/*

 * IMPORTANT: Please add _ALL_ WMI Commands Here.
@@ -1923,6 +1925,7 @@ typedef enum { 
    OP(WMI_MLO_LINK_RECOMMENDATION_CMDID) \

    OP(WMI_MLO_LINK_SET_BSS_PARAMS_CMDID) \

    OP(WMI_MLO_LINK_SWITCH_CONF_CMDID) \

    OP(WMI_NAN_OEM_DATA_CMDID) \

    /* add new CMD_LIST elements above this line */
@@ -2237,6 +2240,7 @@ typedef enum { 
    OP(WMI_ROAM_SYNCH_KEY_EVENTID) \

    OP(WMI_MLO_PRIMARY_LINK_PEER_MIGRATION_EVENTID) \

    OP(WMI_MLO_LINK_SWITCH_REQUEST_EVENTID) \

    OP(WMI_NAN_OEM_DATA_EVENTID) \

    /* add new EVT_LIST elements above this line */
@@ -3867,6 +3871,13 @@ WMITLV_CREATE_PARAM_STRUC(WMI_DEL_PROACTIVE_ARP_RSP_PATTERN_CMDID); 
    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_nan_host_config_param, host_config, WMITLV_SIZE_VAR)

WMITLV_CREATE_PARAM_STRUC(WMI_NAN_CMDID);



/* NAN OEM Data Cmd */

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

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_nan_oem_data_cmd_fixed_param, wmi_nan_oem_data_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_FIXED_STRUC, wmi_nan_oem_data_hdr, nan_oem_data_hdr, WMITLV_SIZE_VAR) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, nan_oem_data_buffer, WMITLV_SIZE_VAR)

WMITLV_CREATE_PARAM_STRUC(WMI_NAN_OEM_DATA_CMDID);



/* NAN Data Get Capabilities Cmd */

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

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_ndi_get_cap_req_fixed_param, wmi_ndi_get_cap_req_fixed_param_PROTOTYPE, fixed_param, WMITLV_SIZE_FIX)
@@ -6255,6 +6266,13 @@ WMITLV_CREATE_PARAM_STRUC(WMI_OEM_DMA_RING_CFG_RSP_EVENTID) 
    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_nan_event_info, event_info, WMITLV_SIZE_VAR)

WMITLV_CREATE_PARAM_STRUC(WMI_NAN_EVENTID);



/* NAN OEM Data Event */

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

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_nan_oem_data_event_fixed_param, wmi_nan_oem_data_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_FIXED_STRUC, wmi_nan_oem_data_hdr, nan_oem_data_hdr, WMITLV_SIZE_VAR) \

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, nan_oem_data_buffer, WMITLV_SIZE_VAR)

WMITLV_CREATE_PARAM_STRUC(WMI_NAN_OEM_DATA_EVENTID);



/* NAN discovery interface created event */

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

    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_nan_disc_iface_created_event_fixed_param, wmi_nan_disc_iface_created_event_fixed_param_PROTOTYPE, fixed_param, WMITLV_SIZE_FIX)

fw/wmi_unified.h

+54 −0
Original line number Diff line number Diff line
@@ -1344,6 +1344,8 @@ typedef enum { 














    /** Nan Request */















    WMI_NAN_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_NAN),













    /** Command to handle OEM's NAN specific opaque data */













    WMI_NAN_OEM_DATA_CMDID,





























    /** Modem power state command */















    WMI_MODEM_POWER_STATE_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_COEX),










@@ -2278,6 +2280,8 @@ typedef enum {













    WMI_NAN_STARTED_CLUSTER_EVENTID,















    WMI_NAN_JOINED_CLUSTER_EVENTID,















    WMI_NAN_DMESG_EVENTID,













    /** Event to deliver OEM's NAN specific opaque data */













    WMI_NAN_OEM_DATA_EVENTID,





























    /* Coex Event */















    WMI_COEX_REPORT_ANTENNA_ISOLATION_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_COEX),










@@ -27618,6 +27622,42 @@ typedef struct {













*/















} wmi_nan_cmd_param;



























typedef enum {













    WMI_NAN_VENDOR1_REQ1 = 1,













} WMI_NAN_OEM_DATA_TYPE;

























typedef struct {













    /** oem_data_type:













     * Indicate what kind of OEM-specific data is present in the













     * oem_data_buffer[].













     * Possible values are listed in the enum WMI_NAN_OEM_DATA_TYPE.













     */













    A_UINT32 oem_data_type;













    /** oem_data_len:













     * Actual length in bytes of the OEM-specific data within the













     * oem_data_buffer[].













     * Note that it is possible for a single message to contain multiple













     * OEM opaque data blobs.  In such cases, the oem_data_len field of













     * nan_oem_data_hdr[0] not only specifies the size of the first such













     * opaque blob, but furthermore specifies the offset in oem_data_buffer[]













     * where the second opaque blob begins.













     */













    A_UINT32 oem_data_len;













} wmi_nan_oem_data_hdr;

























typedef struct {













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

























    /* Following this structure are the below TLVs:













     *   - wmi_nan_oem_data_hdr nan_oem_data_hdr[];













     *     This TLV explains the type and size of the one or more OEM NAN













     *     opaque data blobs carried in this message.













     *   - A_UINT8 nan_oem_data_buffer[];













     *     This TLV holds the contents of the one or more OEM NAN opaque data













     *     blobs carried in this message.













     */













} wmi_nan_oem_data_cmd_fixed_param;



























#define WMI_NAN_GET_RANGING_INITIATOR_ROLE(flag)      WMI_GET_BITS(flag, 0, 1)















#define WMI_NAN_SET_RANGING_INITIATOR_ROLE(flag, val) WMI_SET_BITS(flag, 0, 1, val)















#define WMI_NAN_GET_RANGING_RESPONDER_ROLE(flag)      WMI_GET_BITS(flag, 1, 1)










@@ -27650,6 +27690,19 @@ typedef struct {













*/















} wmi_nan_event_hdr;



























typedef struct {













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

























    /* Following this structure are the below TLVs:













     *   - wmi_nan_oem_data_hdr nan_oem_data_hdr[];













     *     This TLV explains the type and size of the one or more OEM NAN













     *     opaque data blobs carried in this message.













     *   - A_UINT8 nan_oem_data_buffer[];













     *     This TLV holds the contents of the one or more OEM NAN opaque data













     *     blobs carried in this message.













     */













} wmi_nan_oem_data_event_fixed_param;



























typedef struct {















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















    A_UINT32 mac_id; /* MAC ID associated with NAN primary discovery channel; Valid only for NAN enable resp message identified by NAN_MSG_ID_ENABLE_RSP */










@@ -36690,6 +36743,7 @@ static INLINE A_UINT8 *wmi_id_to_name(A_UINT32 wmi_command)













        WMI_RETURN_STRING(WMI_GPIO_STATE_REQ_CMDID);















        WMI_RETURN_STRING(WMI_MLO_PRIMARY_LINK_PEER_MIGRATION_CMDID);















        WMI_RETURN_STRING(WMI_MLO_LINK_RECOMMENDATION_CMDID);













        WMI_RETURN_STRING(WMI_NAN_OEM_DATA_CMDID);















    }





























    return (A_UINT8 *) "Invalid WMI cmd";

























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













#define __WMI_REVISION_ 1356































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















 *  host and firmware of the same WMI namespace will work