microchip-pickit2: move channel creation to after device context alloc

[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 4eb755d274d057e3eae731e378c8f815b9589e4e..f4d5cb7a5307faa2e43e38ed78f6b152787d138e 100644 (file)
--- a/src/hardware/microchip-pickit2/api.c
+++ b/src/hardware/microchip-pickit2/api.c
@@ -158,17 +158,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 = g_malloc0(sizeof(*cg));
-               sdi->channel_groups = g_slist_append(NULL, cg);
-               cg->name = g_strdup("Logic");
-               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.
@@ -182,6 +171,15 @@ 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;
+
+               /* 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);
+               }
        }
 
        return std_scan_complete(di, devices);
@@ -269,21 +267,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;