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 41e7baa2e909e30f56463cf36a493d5405bdd3b3..f4d5cb7a5307faa2e43e38ed78f6b152787d138e 100644 (file)
--- a/src/hardware/microchip-pickit2/api.c
+++ b/src/hardware/microchip-pickit2/api.c
@@ -42,7 +42,7 @@
  * - The current implementation silently accepts sample count limits beyond
  *   1024, just won't provide more than 1024 samples to the session. A
  *   future implementation could cap the settings upon reception. Apps
- *   like Pulseview may not be able to specify 1024, and pass 1000 or
+ *   like PulseView may not be able to specify 1024, and pass 1000 or
  *   2000 instead (the latter results in 1024 getting used).
  * - The manual suggests that users can assign names to devices. The
  *   current implementation supports conn= specs with USB VID:PID pairs
@@ -66,7 +66,7 @@
 
 static struct sr_dev_driver microchip_pickit2_driver_info;
 
-static const char *pickit2_channel_names[] = {
+static const char *channel_names[] = {
        "pin4", "pin5", "pin6",
 };
 
@@ -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(pickit2_channel_names);
-               for (ch_idx = 0; ch_idx < ch_count; ch_idx++) {
-                       ch = sr_channel_new(sdi, ch_idx, SR_CHANNEL_LOGIC,
-                               TRUE, pickit2_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);
@@ -232,6 +230,8 @@ static int dev_close(struct sr_dev_inst *sdi)
        usb = sdi->conn;
        devc = sdi->priv;
 
+       if (!usb)
+               return SR_OK;
        if (!usb->devhdl)
                return SR_OK;
 
@@ -264,24 +264,30 @@ static int config_get(uint32_t key, GVariant **data,
        struct sr_usb_dev_inst *usb;
        uint64_t rate, ratio;
 
-       devc = sdi ? sdi->priv : NULL;
-       (void)devc;
        (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;
@@ -296,10 +302,10 @@ static int config_set(uint32_t key, GVariant *data,
        struct dev_context *devc;
        int idx;
 
-       devc = sdi ? sdi->priv : NULL;
-
        (void)cg;
 
+       devc = sdi ? sdi->priv : NULL;
+
        switch (key) {
        case SR_CONF_SAMPLERATE:
                if (!devc)
@@ -454,5 +460,4 @@ static struct sr_dev_driver microchip_pickit2_driver_info = {
        .dev_acquisition_stop = dev_acquisition_stop,
        .context = NULL,
 };
-
 SR_REGISTER_DEV_DRIVER(microchip_pickit2_driver_info);