diff options
| author | Service qcabuildsw <qcabuildsw@localhost> | 2016-07-14 15:46:18 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-07-14 15:46:18 -0700 |
| commit | 1099fc10ec92fbcb8f87ae64ed9c67447abfb88b (patch) | |
| tree | 58768f720f28d389c6bb4c1358763b03062f1886 | |
| parent | 52e20ddc29277a2c7011c69f18600cca158c66fd (diff) | |
| parent | a280b5cb0b7b96100e0e91731d866e512145c40d (diff) | |
Merge "qcacld-3.0: CL 1528698 - update fw common interface files" into wlan-cld3.driver.lnx.1.1-dev
| -rw-r--r-- | target/inc/wmi_tlv_defs.h | 3 | ||||
| -rw-r--r-- | target/inc/wmi_unified.h | 9 | ||||
| -rw-r--r-- | target/inc/wmi_version.h | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/target/inc/wmi_tlv_defs.h b/target/inc/wmi_tlv_defs.h index 6342d9d40c4a..681bab80e015 100644 --- a/target/inc/wmi_tlv_defs.h +++ b/target/inc/wmi_tlv_defs.h @@ -1170,7 +1170,8 @@ typedef enum { #define WMITLV_TABLE_WMI_INIT_CMDID(id,op,buf,len) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_init_cmd_fixed_param, wmi_init_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_resource_config, wmi_resource_config, resource_config, WMITLV_SIZE_FIX) \ - WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wlan_host_memory_chunk, host_mem_chunks, WMITLV_SIZE_VAR) + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, wlan_host_memory_chunk, host_mem_chunks, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_pdev_set_hw_mode_cmd_fixed_param, wmi_pdev_set_hw_mode_cmd_fixed_param, hw_mode, WMITLV_SIZE_FIX) WMITLV_CREATE_PARAM_STRUC(WMI_INIT_CMDID); diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index a6f010e9960f..aee7cca2db1a 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -2428,9 +2428,16 @@ typedef struct { A_UINT32 num_host_mem_chunks; /** size of array host_mem_chunks[] */ - /* The TLVs for resource_config and host_mem_chunks[] will follow. + /* The TLVs for resource_config, host_mem_chunks[], and + * hw_mode_config will follow. * wmi_resource_config resource_config; * wlan_host_memory_chunk host_mem_chunks[]; + * wmi_pdev_set_hw_mode_cmd_fixed_param hw_mode_config; + * Note that the hw_mode_config, in spite of its "pdev" name, + * applies to the entire target rather than for a single pdev + * within the target. + * To avoid specifying a HW mode for the target, the host should + * fill hw_mode_config's fields with 0x0. */ } wmi_init_cmd_fixed_param; diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index 58ab61a2544c..236cbce8c4d6 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/wmi_version.h @@ -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_ 263 +#define __WMI_REVISION_ 264 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work |