evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASoc: msm: Add changes to support multiple meta key value pairs"

Browse source
This commit is contained in:
Linux Build Service Account 2016-12-09 19:59:01 -08:00 • committed by Gerrit - the friendly Code Review server
commit 3160351d53
1 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
sound/soc/msm/qdsp6v2/q6core.c
View file

@ -193,6 +193,31 @@ void ocm_core_open(void)
pr_err("%s: Unable to register CORE\n", __func__);
}
struct cal_block_data *cal_utils_get_cal_block_by_key(
struct cal_type_data *cal_type, uint32_t key)
{
struct list_head *ptr, *next;
struct cal_block_data *cal_block = NULL;
struct audio_cal_info_metainfo *metainfo;
list_for_each_safe(ptr, next,
&cal_type->cal_blocks) {
cal_block = list_entry(ptr,
struct cal_block_data, list);
metainfo = (struct audio_cal_info_metainfo *)
cal_block->cal_info;
if (metainfo->nKey != key) {
pr_debug("%s: metainfo key mismatch!!! found:%x, needed:%x\n",
__func__, metainfo->nKey, key);
} else {
pr_debug("%s: metainfo key match found", __func__);
return cal_block;
}
}
return NULL;
}
int32_t core_set_license(uint32_t key, uint32_t module_id)
{
struct avcs_cmd_set_license *cmd_setl = NULL;
@ -210,8 +235,8 @@ int32_t core_set_license(uint32_t key, uint32_t module_id)
}
mutex_lock(&((q6core_lcl.cal_data[META_CAL])->lock));
cal_block =
cal_utils_get_only_cal_block(q6core_lcl.cal_data[META_CAL]);
cal_block = cal_utils_get_cal_block_by_key(
q6core_lcl.cal_data[META_CAL], key);
if (cal_block == NULL ||
cal_block->cal_data.kvaddr == NULL ||
cal_block->cal_data.size <= 0) {
@ -219,21 +244,6 @@ int32_t core_set_license(uint32_t key, uint32_t module_id)
rc = -EINVAL;
goto cal_data_unlock;
}
metainfo = (struct audio_cal_info_metainfo *)cal_block->cal_info;
if (metainfo == NULL) {
pr_err("%s: No metainfo!!!", __func__);
rc = -EINVAL;
goto cal_data_unlock;
}
if (metainfo->nKey != key) {
pr_err("%s: metainfo key mismatch!!! found:%x, needed:%x\n",
__func__, metainfo->nKey, key);
rc = -EINVAL;
goto cal_data_unlock;
} else if (key == 0) {
pr_err("%s: metainfo key is %d a invalid key", __func__, key);
goto cal_data_unlock;
}
packet_size = sizeof(struct avcs_cmd_set_license) +
cal_block->cal_data.size;