hal: use proper snd_card_name for acdb_init
Use tasha snd card name for tasha lite variants as
well for acdb_init to load the same set of ACDB
files for both the variants.
CRs-Fixed: 2173200
Change-Id: I870986b11c8e6d2937705970e10af0038e008f1e
diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index ef23b15..c6b0bc8 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -1851,7 +1851,7 @@
plat_data->hw_dep_fd = fd;
}
-const char * get_snd_card_name_for_acdb_loader(const char *snd_card_name) {
+const char * platform_get_snd_card_name_for_acdb_loader(const char *snd_card_name) {
if(snd_card_name == NULL)
return NULL;
@@ -1905,7 +1905,7 @@
{
struct platform_data *my_data = (struct platform_data *)platform;
char *cvd_version = NULL;
- const char *snd_card_name, *acdb_snd_card_name;
+ const char *snd_card_name;
int result = -1;
struct listnode *node;
struct meta_key_list *key_info;
@@ -1920,21 +1920,21 @@
}
snd_card_name = mixer_get_name(my_data->adev->mixer);
- acdb_snd_card_name = get_snd_card_name_for_acdb_loader(snd_card_name);
+ snd_card_name = platform_get_snd_card_name_for_acdb_loader(snd_card_name);
if (my_data->acdb_init_v3) {
- result = my_data->acdb_init_v3(acdb_snd_card_name, cvd_version,
+ result = my_data->acdb_init_v3(snd_card_name, cvd_version,
&my_data->acdb_meta_key_list);
} else if (my_data->acdb_init) {
node = list_head(&my_data->acdb_meta_key_list);
key_info = node_to_item(node, struct meta_key_list, list);
key = key_info->cal_info.nKey;
- result = my_data->acdb_init(acdb_snd_card_name, cvd_version, key);
+ result = my_data->acdb_init(snd_card_name, cvd_version, key);
}
/* Save these variables in platform_data. These will be used
while reloading ACDB files during run time. */
strlcpy(my_data->cvd_version, cvd_version, MAX_CVD_VERSION_STRING_SIZE);
- strlcpy(my_data->snd_card_name, acdb_snd_card_name,
+ strlcpy(my_data->snd_card_name, snd_card_name,
MAX_SND_CARD_STRING_SIZE);
if (cvd_version)