diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-02-12 05:01:44 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-02-12 05:01:43 -0800 |
| commit | 2c24f5e2c00430e4ea79d2e41229526c4579ccee (patch) | |
| tree | 272391d14325bc35c5ce1a4843904ea8db3119a7 /include | |
| parent | 01829b37805882f69f911fd47e081fa3559cf134 (diff) | |
| parent | bc6ca96313924244620bb372ff301fda4027c7e9 (diff) | |
Merge "ASoC: msm: qdsp6v2: Add support to query AVCS version info"
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/apr_audio-v2.h | 7 | ||||
| -rw-r--r-- | include/sound/q6core.h | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/include/sound/apr_audio-v2.h b/include/sound/apr_audio-v2.h index 52677a15819e..cd85a4a40d3a 100644 --- a/include/sound/apr_audio-v2.h +++ b/include/sound/apr_audio-v2.h @@ -9331,6 +9331,8 @@ struct asm_eq_params { #define VSS_ICOMMON_CMD_GET_PARAM_V3 0x00013246 #define VSS_ICOMMON_RSP_GET_PARAM_V3 0x00013247 +#define VSS_MAX_AVCS_NUM_SERVICES 25 + /** ID of the Bass Boost module. This module supports the following parameter IDs: - #AUDPROC_PARAM_ID_BASS_BOOST_ENABLE @@ -9974,6 +9976,7 @@ struct asm_aptx_dec_fmt_blk_v2 { #define AVCS_CMDRSP_GET_FWK_VERSION (0x0001292D) #define AVCS_SERVICE_ID_ALL (0xFFFFFFFF) +#define APRV2_IDS_SERVICE_ID_ADSP_CVP_V (0xB) struct avcs_get_fwk_version { /* @@ -10032,9 +10035,9 @@ struct avs_svc_api_info { }; struct avcs_fwk_ver_info { - struct avcs_get_fwk_version avcs_build; + struct avcs_get_fwk_version avcs_fwk_version; struct avs_svc_api_info services[0]; -}; +} __packed; /* LSM Specific */ #define VW_FEAT_DIM (39) diff --git a/include/sound/q6core.h b/include/sound/q6core.h index 0ce171973cb5..e70e4ba9b968 100644 --- a/include/sound/q6core.h +++ b/include/sound/q6core.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -24,8 +24,10 @@ bool q6core_is_adsp_ready(void); int q6core_add_remove_pool_pages(phys_addr_t buf_add, uint32_t bufsz, uint32_t mempool_id, bool add_pages); -int q6core_get_avcs_fwk_ver_info(uint32_t service_id, - struct avcs_fwk_ver_info *ver_info); +int q6core_get_service_version(uint32_t service_id, + struct avcs_fwk_ver_info *ver_info, + size_t size); +size_t q6core_get_fwk_version_size(uint32_t service_id); #define ADSP_CMD_SET_DTS_EAGLE_DATA_ID 0x00012919 #define DTS_EAGLE_LICENSE_ID 0x00028346 |