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

[libsigrok.git] / src / hardware / microchip-pickit2 / api.c

diff --git a/src/hardware/microchip-pickit2/api.c b/src/hardware/microchip-pickit2/api.c
index d8a757283655496d10b9a2c2d26eed2c7c875694..97d5b13cd96392c70a5fc0eb382004e00a540d57 100644 (file)
--- a/src/hardware/microchip-pickit2/api.c
+++ b/src/hardware/microchip-pickit2/api.c
@@ -72,6 +72,7 @@ static const char *channel_names[] = {
 
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
+       SR_CONF_PROBE_NAMES,
 };
 
 static const uint32_t drvopts[] = {
@@ -119,6 +120,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
        struct drv_context *drvc;
        const char *conn;
+       const char *probe_names;
        GSList *l, *devices, *usb_devices;
        struct sr_config *cfg;
        struct sr_usb_dev_inst *usb;
@@ -131,12 +133,16 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        drvc = di->context;
 
        conn = PICKIT2_DEFAULT_ADDRESS;
+       probe_names = NULL;
        for (l = options; l; l = l->next) {
                cfg = l->data;
                switch (cfg->key) {
                case SR_CONF_CONN:
                        conn = g_variant_get_string(cfg->data, NULL);
                        break;
+               case SR_CONF_PROBE_NAMES:
+                       probe_names = g_variant_get_string(cfg->data, NULL);
+                       break;
                }
        }
 
@@ -158,15 +164,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                sdi->conn = usb;
                sdi->connection_id = g_strdup(conn);
 
-               /* Create the logic channels group. */
-               cg = sr_channel_group_new(sdi, "Logic", NULL);
-               ch_count = ARRAY_SIZE(channel_names);
-               for (ch_idx = 0; ch_idx < ch_count; ch_idx++) {
-                       ch = sr_channel_new(sdi, ch_idx, SR_CHANNEL_LOGIC,
-                               TRUE, channel_names[ch_idx]);
-                       cg->channels = g_slist_append(cg->channels, ch);
-               }
-
                /*
                 * Create the device context. Pre-select the highest
                 * samplerate and the deepest sample count available.
@@ -180,6 +177,17 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                devc->num_captureratios = ARRAY_SIZE(captureratios);
                devc->curr_captureratio_idx = 0;
                devc->sw_limits.limit_samples = PICKIT2_SAMPLE_COUNT;
+               devc->channel_names = sr_parse_probe_names(probe_names,
+                       channel_names, ARRAY_SIZE(channel_names),
+                       ARRAY_SIZE(channel_names), &ch_count);
+
+               /* Create the logic channels group. */
+               cg = sr_channel_group_new(sdi, "Logic", NULL);
+               for (ch_idx = 0; ch_idx < ch_count; ch_idx++) {
+                       ch = sr_channel_new(sdi, ch_idx, SR_CHANNEL_LOGIC,
+                               TRUE, devc->channel_names[ch_idx]);
+                       cg->channels = g_slist_append(cg->channels, ch);
+               }
        }
 
        return std_scan_complete(di, devices);
@@ -267,21 +275,27 @@ static int config_get(uint32_t key, GVariant **data,
        (void)cg;
 
        devc = sdi ? sdi->priv : NULL;
+       usb = sdi ? sdi->conn : NULL;
 
        switch (key) {
        case SR_CONF_CONN:
-               if (!sdi->conn)
+               if (!usb)
                        return SR_ERR_ARG;
-               usb = sdi->conn;
                *data = g_variant_new_printf("%d.%d", usb->bus, usb->address);
                return SR_OK;
        case SR_CONF_SAMPLERATE:
+               if (!devc)
+                       return SR_ERR_ARG;
                rate = devc->samplerates[devc->curr_samplerate_idx];
                *data = g_variant_new_uint64(rate);
                return SR_OK;
        case SR_CONF_LIMIT_SAMPLES:
+               if (!devc)
+                       return SR_ERR_ARG;
                return sr_sw_limits_config_get(&devc->sw_limits, key, data);
        case SR_CONF_CAPTURE_RATIO:
+               if (!devc)
+                       return SR_ERR_ARG;
                ratio = devc->captureratios[devc->curr_captureratio_idx];
                *data = g_variant_new_uint64(ratio);
                return SR_OK;