output/csv: use intermediate time_t var, silence compiler warning

[libsigrok.git] / src / hardware / openbench-logic-sniffer / api.c

diff --git a/src/hardware/openbench-logic-sniffer/api.c b/src/hardware/openbench-logic-sniffer/api.c
index 35f6be7e24582f7e65b834e752201c6570afbb16..09ef065939c22e6511775c1bc3f25fa62ea6bd3a 100644 (file)
--- a/src/hardware/openbench-logic-sniffer/api.c
+++ b/src/hardware/openbench-logic-sniffer/api.c
@@ -25,6 +25,7 @@
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
        SR_CONF_SERIALCOMM,
+       SR_CONF_PROBE_NAMES,
 };
 
 static const uint32_t drvopts[] = {
@@ -100,11 +101,13 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        GSList *l;
        int num_read;
        unsigned int i;
-       const char *conn, *serialcomm;
+       const char *conn, *serialcomm, *probe_names;
        char buf[4] = { 0, 0, 0, 0 };
        struct dev_context *devc;
+       size_t ch_max;
 
        conn = serialcomm = NULL;
+       probe_names = NULL;
        for (l = options; l; l = l->next) {
                src = l->data;
                switch (src->key) {
@@ -114,6 +117,9 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                case SR_CONF_SERIALCOMM:
                        serialcomm = 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)
@@ -182,10 +188,15 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        devc = g_malloc0(sizeof(*devc));
        sdi->priv = devc;
        devc->trigger_at_smpl = OLS_NO_TRIGGER;
+       devc->channel_names = sr_parse_probe_names(probe_names,
+               ols_channel_names, ARRAY_SIZE(ols_channel_names),
+               ARRAY_SIZE(ols_channel_names), &ch_max);
 
        /*
         * Definitely using the OLS protocol, check if it supports
-        * the metadata command.
+        * the metadata command. Otherwise assign generic values.
+        * Create as many sigrok channels as was determined when
+        * the device was probed.
         */
        send_shortcommand(serial, CMD_METADATA);
        g_usleep(RESPONSE_DELAY_US);
@@ -193,14 +204,18 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                /* Got metadata. */
                (void)ols_get_metadata(sdi);
        } else {
-               /* Not an OLS -- some other board that uses the sump protocol. */
+               /* Not an OLS -- some other board using the SUMP protocol. */
                sr_info("Device does not support metadata.");
                sdi->vendor = g_strdup("Sump");
                sdi->model = g_strdup("Logic Analyzer");
                sdi->version = g_strdup("v1.0");
-               for (i = 0; i < ARRAY_SIZE(ols_channel_names); i++)
-                       sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE,
-                                      ols_channel_names[i]);
+               devc->max_channels = ch_max;
+       }
+       if (devc->max_channels && ch_max > devc->max_channels)
+               ch_max = devc->max_channels;
+       for (i = 0; i < ch_max; i++) {
+               sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE,
+                       devc->channel_names[i]);
        }
        /* Configure samplerate and divider. */
        if (ols_set_samplerate(sdi, DEFAULT_SAMPLERATE) != SR_OK)