topology: Change uuid value to 16 separate characters in text conf file

Previously in text conf file, the uuid value of vendor tuples is a
16-characer string. Now change it to 16 characters separated by commas,
easier for users to edit it manually.

Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/include/topology.h b/include/topology.h
index d666505f17c5118c46ba393230961491a959cbf8..89bed6c43f7a8e97183a5316108aad14023c85f3 100644 (file)
--- a/include/topology.h
+++ b/include/topology.h
@@ -273,8 +273,8 @@ extern "C" {
  *             ...
  *     }
  *
- *     tuples."uuid" {
- *             VENDOR_TOKEN_ID2 "16 character uuid"
+ *     tuples."uuid" {                 # 16 characters separated by commas
+ *             VENDOR_TOKEN_ID2 "0x01,0x02,...,0x0f"
  *             ...
  *     }
  *

diff --git a/src/topology/data.c b/src/topology/data.c
index e60114e9a578f806add2b7eb8ed8e10d2917bc71..a0c5ea26ea8054c7747393936956eafc653a98b3 100644 (file)
--- a/src/topology/data.c
+++ b/src/topology/data.c
@@ -176,6 +176,49 @@ static int get_hex_num(const char *str)
        return values;
 }
 
+/* get uuid from a string made by 16 characters separated by commas */
+static int get_uuid(const char *str, unsigned char *uuid_le)
+{
+       unsigned long int  val;
+       char *tmp, *s = NULL;
+       int values = 0, ret = 0;
+
+       tmp = strdup(str);
+       if (tmp == NULL)
+               return -ENOMEM;
+
+       s = strtok(tmp, ",");
+
+       while (s != NULL) {
+               errno = 0;
+               val = strtoul(s, NULL, 0);
+               if ((errno == ERANGE && val == ULONG_MAX)
+                       || (errno != 0 && val == 0)
+                       || (val > UCHAR_MAX)) {
+                       SNDERR("error: invalid value for uuid\n");
+                       ret = -EINVAL;
+                       goto out;
+               }
+
+                *(uuid_le + values) = (unsigned char)val;
+
+               values++;
+               if (values >= 16)
+                       break;
+
+               s = strtok(NULL, ",");
+       }
+
+       if (values < 16) {
+               SNDERR("error: less than 16 integers for uuid\n");
+               ret = -EINVAL;
+       }
+
+out:
+       free(tmp);
+       return ret;
+}
+
 static int write_hex(char *buf, char *str, int width)
 {
        long val;
@@ -474,7 +517,7 @@ static int build_tuples(snd_tplg_t *tplg, struct tplg_elem *elem)
        return 0;
 }
 
-static int parse_tuple_set(snd_tplg_t *tplg, snd_config_t *cfg,
+static int parse_tuple_set(snd_config_t *cfg,
        struct tplg_tuple_set **s)
 {
        snd_config_iterator_t i, next;
@@ -484,7 +527,6 @@ static int parse_tuple_set(snd_tplg_t *tplg, snd_config_t *cfg,
        unsigned int type, num_tuples = 0;
        struct tplg_tuple *tuple;
        unsigned long int tuple_val;
-       int len;
 
        snd_config_get_id(cfg, &id);
 
@@ -535,14 +577,8 @@ static int parse_tuple_set(snd_tplg_t *tplg, snd_config_t *cfg,
 
                switch (type) {
                case SND_SOC_TPLG_TUPLE_TYPE_UUID:
-                       len = strlen(value);
-                       if (len > 16 || len == 0) {
-                               SNDERR("error: tuple %s: invalid uuid\n", id);
+                       if (get_uuid(value, tuple->uuid) < 0)
                                goto err;
-                       }
-
-                       memcpy(tuple->uuid, value, len);
-                       tplg_dbg("\t\t%s = %s\n", tuple->token, tuple->uuid);
                        break;
 
                case SND_SOC_TPLG_TUPLE_TYPE_STRING:
@@ -598,7 +634,7 @@ err:
        return -EINVAL;
 }
 
-static int parse_tuple_sets(snd_tplg_t *tplg, snd_config_t *cfg,
+static int parse_tuple_sets(snd_config_t *cfg,
        struct tplg_vendor_tuples *tuples)
 {
        snd_config_iterator_t i, next;
@@ -632,7 +668,7 @@ static int parse_tuple_sets(snd_tplg_t *tplg, snd_config_t *cfg,
                        return -EINVAL;
                }
 
-               err = parse_tuple_set(tplg, n, &tuples->set[tuples->num_sets]);
+               err = parse_tuple_set(n, &tuples->set[tuples->num_sets]);
                if (err < 0)
                        return err;
 
@@ -774,7 +810,7 @@ int tplg_parse_tuples(snd_tplg_t *tplg, snd_config_t *cfg,
                }
 
                if (strcmp(id, "tuples") == 0) {
-                       err = parse_tuple_sets(tplg, n, tuples);
+                       err = parse_tuple_sets(n, tuples);
                        if (err < 0)
                                return err;
                }

diff --git a/src/topology/tplg_local.h b/src/topology/tplg_local.h
index 518b81eded1f234f9ca83ca75854aca17e918c2a..48db813d5944b1f5e329812c0e7498bd18ff05d8 100644 (file)
--- a/src/topology/tplg_local.h
+++ b/src/topology/tplg_local.h
@@ -104,7 +104,7 @@ struct tplg_tuple {
        char token[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
        union {
                char string[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
-               char uuid[16];
+               unsigned char uuid[16];
                unsigned int value;
        };
 };