sr_dev_clear(): Always free sdi->priv (devc).

[libsigrok.git] / src / hardware / rigol-ds / api.c

diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c
index fd8a8b05948b303bf3a4a45bdeef0f7e540b13c9..221b1234ac6177c30bccfc92b56cba6c00f60ca8 100644 (file)
--- a/src/hardware/rigol-ds/api.c
+++ b/src/hardware/rigol-ds/api.c
@@ -288,12 +288,11 @@ static void clear_helper(void *priv)
        g_free(devc->trigger_source);
        g_free(devc->trigger_slope);
        g_free(devc->analog_groups);
-       g_free(devc);
 }
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, clear_helper);
+       return std_dev_clear_with_callback(di, clear_helper);
 }
 
 static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
@@ -445,8 +444,6 @@ static int dev_open(struct sr_dev_inst *sdi)
                return SR_ERR;
        }
 
-       sdi->status = SR_ST_ACTIVE;
-
        return SR_OK;
 }
 
@@ -455,22 +452,16 @@ static int dev_close(struct sr_dev_inst *sdi)
        struct sr_scpi_dev_inst *scpi;
        struct dev_context *devc;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        scpi = sdi->conn;
        devc = sdi->priv;
 
+       if (!scpi)
+               return SR_ERR_BUG;
+
        if (devc->model->series->protocol == PROTOCOL_V2)
                rigol_ds_config_set(sdi, ":KEY:LOCK DISABLE");
 
-       if (scpi) {
-               if (sr_scpi_close(scpi) < 0)
-                       return SR_ERR;
-               sdi->status = SR_ST_INACTIVE;
-       }
-
-       return SR_OK;
+       return sr_scpi_close(scpi);
 }
 
 static int analog_frame_size(const struct sr_dev_inst *sdi)
@@ -670,9 +661,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 
        devc = sdi->priv;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        /* If a channel group is specified, it must be a valid one. */
        if (cg && !g_slist_find(sdi->channel_groups, cg)) {
                sr_err("Invalid channel group specified.");
@@ -997,9 +985,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        gboolean some_digital;
        GSList *l;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        scpi = sdi->conn;
        devc = sdi->priv;
 
@@ -1021,10 +1006,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
                                devc->analog_channels[ch->index] = ch->enabled;
                        }
                } else if (ch->type == SR_CHANNEL_LOGIC) {
-                       /* Only one list entry for DS1000D series. All channels are retrieved
-                        * together when this entry is processed. */
+                       /* Only one list entry for older protocols. All channels are
+                        * retrieved together when this entry is processed. */
                        if (ch->enabled && (
-                                               devc->model->series->protocol > PROTOCOL_V2 ||
+                                               devc->model->series->protocol > PROTOCOL_V3 ||
                                                !some_digital))
                                devc->enabled_channels = g_slist_append(
                                                devc->enabled_channels, ch);
@@ -1033,7 +1018,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
                                /* Turn on LA module if currently off. */
                                if (!devc->la_enabled) {
                                        if (rigol_ds_config_set(sdi,
-                                                       devc->model->series->protocol >= PROTOCOL_V4 ?
+                                                       devc->model->series->protocol >= PROTOCOL_V3 ?
                                                                ":LA:STAT ON" : ":LA:DISP ON") != SR_OK)
                                                return SR_ERR;
                                        devc->la_enabled = TRUE;
@@ -1042,7 +1027,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
                        if (ch->enabled != devc->digital_channels[ch->index]) {
                                /* Enabled channel is currently disabled, or vice versa. */
                                if (rigol_ds_config_set(sdi,
-                                               devc->model->series->protocol >= PROTOCOL_V4 ?
+                                               devc->model->series->protocol >= PROTOCOL_V3 ?
                                                        ":LA:DIG%d:DISP %s" : ":DIG%d:TURN %s", ch->index,
                                                ch->enabled ? "ON" : "OFF") != SR_OK)
                                        return SR_ERR;
@@ -1057,7 +1042,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        /* Turn off LA module if on and no digital channels selected. */
        if (devc->la_enabled && !some_digital)
                if (rigol_ds_config_set(sdi,
-                               devc->model->series->protocol >= PROTOCOL_V4 ?
+                               devc->model->series->protocol >= PROTOCOL_V3 ?
                                        ":LA:STAT OFF" : ":LA:DISP OFF") != SR_OK)
                        return SR_ERR;
 
@@ -1119,11 +1104,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 
        devc = sdi->priv;
 
-       if (sdi->status != SR_ST_ACTIVE) {
-               sr_err("Device inactive, can't stop acquisition.");
-               return SR_ERR;
-       }
-
        std_session_send_df_end(sdi);
 
        g_slist_free(devc->enabled_channels);