mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-07 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

topology: add tplg_get_unsigned() function

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2019-12-14 14:05:49 +01:00
parent 1047a5f3c0
commit 14e43a1187
4 changed files with 55 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/topology/data.c
View file

@ -556,7 +556,7 @@ static int parse_tuple_set(snd_config_t *cfg,
struct tplg_tuple_set *set;
unsigned int type, num_tuples = 0;
struct tplg_tuple *tuple;
unsigned long int tuple_val;
unsigned int tuple_val;
int ival;
snd_config_get_id(cfg, &id);
@ -598,10 +598,6 @@ static int parse_tuple_set(snd_config_t *cfg,
if (snd_config_get_id(n, &id) < 0)
continue;
/* get value */
if (snd_config_get_string(n, &value) < 0)
continue;
tuple = &set->tuple[set->num_tuples];
snd_strlcpy(tuple->token, id,
SNDRV_CTL_ELEM_ID_NAME_MAXLEN);
@ -633,14 +629,9 @@ static int parse_tuple_set(snd_config_t *cfg,
case SND_SOC_TPLG_TUPLE_TYPE_BYTE:
case SND_SOC_TPLG_TUPLE_TYPE_SHORT:
case SND_SOC_TPLG_TUPLE_TYPE_WORD:
if (snd_config_get_string(n, &value) < 0)
continue;
errno = 0;
/* no support for negative value */
tuple_val = strtoul(value, NULL, 0);
if ((errno == ERANGE && tuple_val == ULONG_MAX)
|| (errno != 0 && tuple_val == 0)) {
SNDERR("error: tuple %s:strtoul fail\n", id);
ival = tplg_get_unsigned(n, &tuple_val, 0);
if (ival < 0) {
SNDERR("error: tuple %s: %s\n", id, snd_strerror(ival));
goto err;
}
@ -654,7 +645,7 @@ static int parse_tuple_set(snd_config_t *cfg,
goto err;
}
tuple->value = (unsigned int) tuple_val;
tuple->value = tuple_val;
tplg_dbg("\t\t%s = 0x%x\n", tuple->token, tuple->value);
break;