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

Commit e8acfc54 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: Fix a issue for WLFW QMI files"

parents 1483731d 86ee6750

drivers/net/wireless/cnss_utils/wlan_firmware_service_v01.c

+19 −1
Original line number Diff line number Diff line
@@ -2591,6 +2591,24 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = { 
		.elem_size      = sizeof(u8),

		.array_type       = NO_ARRAY,

		.tlv_type       = 0x1E,

		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,

					   platform_name_valid),

	},

	{

		.data_type      = QMI_STRING,

		.elem_len       = QMI_WLFW_MAX_PLATFORM_NAME_LEN_V01 + 1,

		.elem_size      = sizeof(char),

		.array_type       = NO_ARRAY,

		.tlv_type       = 0x1E,

		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,

					   platform_name),

	},

	{

		.data_type      = QMI_OPT_FLAG,

		.elem_len       = 1,

		.elem_size      = sizeof(u8),

		.array_type       = NO_ARRAY,

		.tlv_type       = 0x1F,

		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,

					   ddr_range_valid),

	},
@@ -2599,7 +2617,7 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = { 
		.elem_len       = QMI_WLFW_MAX_HOST_DDR_RANGE_SIZE_V01,

		.elem_size      = sizeof(struct wlfw_host_ddr_range_s_v01),

		.array_type       = STATIC_ARRAY,

		.tlv_type       = 0x1E,

		.tlv_type       = 0x1F,

		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,

					   ddr_range),

		.ei_array      = wlfw_host_ddr_range_s_v01_ei,

drivers/net/wireless/cnss_utils/wlan_firmware_service_v01.h

+4 −1
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ 
#define QMI_WLFW_MAX_NUM_SHADOW_REG_V01 24

#define QMI_WLFW_MAC_ADDR_SIZE_V01 6

#define QMI_WLFW_MAX_NUM_SHADOW_REG_V2_V01 36

#define QMI_WLFW_MAX_PLATFORM_NAME_LEN_V01 64

#define QMI_WLFW_MAX_NUM_SVC_V01 24



enum wlfw_driver_mode_enum_v01 {
@@ -669,12 +670,14 @@ struct wlfw_host_cap_req_msg_v01 { 
	u8 mem_cfg_mode;

	u8 cal_duration_valid;

	u16 cal_duration;

	u8 platform_name_valid;

	char platform_name[QMI_WLFW_MAX_PLATFORM_NAME_LEN_V01 + 1];

	u8 ddr_range_valid;

	struct wlfw_host_ddr_range_s_v01

		ddr_range[QMI_WLFW_MAX_HOST_DDR_RANGE_SIZE_V01];

};



#define WLFW_HOST_CAP_REQ_MSG_V01_MAX_MSG_LEN 245

#define WLFW_HOST_CAP_REQ_MSG_V01_MAX_MSG_LEN 312

extern struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[];



struct wlfw_host_cap_resp_msg_v01 {