kingst-la2016: add support for "probe names" scan option

Add support for the SR_CONF_PROBE_NAMES scan option. Optionally assign
user specified channel names instead of the driver's builtin names.

diff --git a/src/hardware/kingst-la2016/api.c b/src/hardware/kingst-la2016/api.c
index ab44d3b380a26b7974d15aca2529a8f066a8c4d2..742f3e3ae6a0a3155e2516e32903894db4770c84 100644 (file)
--- a/src/hardware/kingst-la2016/api.c
+++ b/src/hardware/kingst-la2016/api.c
@@ -36,6 +36,7 @@
 
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
 
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,

+       SR_CONF_PROBE_NAMES,

 };
 
 static const uint32_t drvopts[] = {
 };
 
 static const uint32_t drvopts[] = {


@@ -430,6 +431,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        uint8_t bus, addr;
        uint16_t pid;
        const char *conn;
        uint8_t bus, addr;
        uint16_t pid;
        const char *conn;

+       const char *probe_names;

        char conn_id[64];
        int ret;
        size_t ch_off, ch_max;
        char conn_id[64];
        int ret;
        size_t ch_off, ch_max;


@@ -441,12 +443,16 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
        conn = NULL;
        conn_devices = NULL;
 
        conn = NULL;
        conn_devices = NULL;

+       probe_names = NULL;

        for (l = options; l; l = l->next) {
                src = l->data;
                switch (src->key) {
                case SR_CONF_CONN:
                        conn = g_variant_get_string(src->data, NULL);
                        break;
        for (l = options; l; l = l->next) {
                src = l->data;
                switch (src->key) {
                case SR_CONF_CONN:
                        conn = g_variant_get_string(src->data, NULL);
                        break;

+               case SR_CONF_PROBE_NAMES:
+                       probe_names = g_variant_get_string(src->data, NULL);
+                       break;

                }
        }
        if (conn)
                }
        }
        if (conn)


@@ -595,12 +601,14 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                ch_max = ARRAY_SIZE(channel_names_logic);
                if (ch_max > devc->model->channel_count)
                        ch_max = devc->model->channel_count;
                ch_max = ARRAY_SIZE(channel_names_logic);
                if (ch_max > devc->model->channel_count)
                        ch_max = devc->model->channel_count;

+               devc->channel_names_logic = sr_parse_probe_names(probe_names,
+                       channel_names_logic, ch_max, ch_max, &ch_max);

                cg = sr_channel_group_new(sdi, "Logic", NULL);
                devc->cg_logic = cg;
                for (ch_idx = 0; ch_idx < ch_max; ch_idx++) {
                        ch = sr_channel_new(sdi, ch_off,
                                SR_CHANNEL_LOGIC, TRUE,
                cg = sr_channel_group_new(sdi, "Logic", NULL);
                devc->cg_logic = cg;
                for (ch_idx = 0; ch_idx < ch_max; ch_idx++) {
                        ch = sr_channel_new(sdi, ch_off,
                                SR_CHANNEL_LOGIC, TRUE,

-                               channel_names_logic[ch_idx]);
+                               devc->channel_names_logic[ch_idx]);

                        ch_off++;
                        cg->channels = g_slist_append(cg->channels, ch);
                }
                        ch_off++;
                        cg->channels = g_slist_append(cg->channels, ch);
                }

diff --git a/src/hardware/kingst-la2016/protocol.h b/src/hardware/kingst-la2016/protocol.h
index dd1092446d06d6db15fa1c19007615b465a3fe11..995ae64bfd80f063626e01f0399f9c7c04ad7d62 100644 (file)
--- a/src/hardware/kingst-la2016/protocol.h
+++ b/src/hardware/kingst-la2016/protocol.h
@@ -123,6 +123,7 @@ struct dev_context {
        uint64_t fw_uploaded; /* Timestamp of most recent FW upload. */
        uint8_t identify_magic, identify_magic2;
        const struct kingst_model *model;
        uint64_t fw_uploaded; /* Timestamp of most recent FW upload. */
        uint8_t identify_magic, identify_magic2;
        const struct kingst_model *model;

+       char **channel_names_logic;

        struct sr_channel_group *cg_logic, *cg_pwm;
 
        /* User specified parameters. */
        struct sr_channel_group *cg_logic, *cg_pwm;
 
        /* User specified parameters. */