]> sigrok.org Git - libsigrok.git/blobdiff - src/hardware/rigol-ds/api.c
projects / libsigrok.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
sr_dev_close(): Set status to SR_ST_INACTIVE.
[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 c7a8937690e796917d3a65707dd4dff2af3cb5e9..bd4c71181264907c8df6f8c09220b6d02ccb4f68 100644 (file)
--- a/src/hardware/rigol-ds/api.c
+++ b/src/hardware/rigol-ds/api.c
@@ -37,16 +37,19 @@ static const uint32_t scanopts[] = {
        SR_CONF_SERIALCOMM
 };
 
-static const uint32_t devopts[] = {
+static const uint32_t drvopts[] = {
        SR_CONF_OSCILLOSCOPE,
+};
+
+static const uint32_t devopts[] = {
        SR_CONF_LIMIT_FRAMES | SR_CONF_SET,
+       SR_CONF_SAMPLERATE | SR_CONF_GET,
        SR_CONF_TIMEBASE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+       SR_CONF_NUM_HDIV | SR_CONF_GET,
+       SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_SET,
        SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_TRIGGER_LEVEL | SR_CONF_GET | SR_CONF_SET,
-       SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_SET,
-       SR_CONF_NUM_HDIV | SR_CONF_GET,
-       SR_CONF_SAMPLERATE | SR_CONF_GET,
        SR_CONF_DATA_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
@@ -247,6 +250,10 @@ static const struct rigol_ds_model supported_models[] = {
        {SERIES(DS2000A), "DS2102A", {5, 1000000000}, 2, false},
        {SERIES(DS2000A), "DS2202A", {2, 1000000000}, 2, false},
        {SERIES(DS2000A), "DS2302A", {1, 1000000000}, 2, false},
+       {SERIES(DS2000A), "MSO2072A", {5, 1000000000}, 2, true},
+       {SERIES(DS2000A), "MSO2102A", {5, 1000000000}, 2, true},
+       {SERIES(DS2000A), "MSO2202A", {2, 1000000000}, 2, true},
+       {SERIES(DS2000A), "MSO2302A", {1, 1000000000}, 2, true},
        {SERIES(DSO1000), "DSO1002A", {5, 1000000000}, 2, false},
        {SERIES(DSO1000), "DSO1004A", {5, 1000000000}, 4, false},
        {SERIES(DSO1000), "DSO1012A", {2, 1000000000}, 2, false},
@@ -438,8 +445,6 @@ static int dev_open(struct sr_dev_inst *sdi)
                return SR_ERR;
        }
 
-       sdi->status = SR_ST_ACTIVE;
-
        return SR_OK;
 }
 
@@ -448,22 +453,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)
@@ -663,9 +662,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.");
@@ -852,13 +848,17 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
        unsigned int i;
        struct dev_context *devc = NULL;
 
+       /* SR_CONF_SCAN_OPTIONS is always valid, regardless of sdi or channel group. */
        if (key == SR_CONF_SCAN_OPTIONS) {
                *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
                                scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
                return SR_OK;
-       } else if (key == SR_CONF_DEVICE_OPTIONS && !cg) {
+       }
+
+       /* If sdi is NULL, nothing except SR_CONF_DEVICE_OPTIONS can be provided. */
+       if (key == SR_CONF_DEVICE_OPTIONS && !sdi) {
                *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                               devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
+                               drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
                return SR_OK;
        }
 
@@ -876,8 +876,11 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
        switch (key) {
        case SR_CONF_DEVICE_OPTIONS:
                if (!cg) {
-                       sr_err("No channel group specified.");
-                       return SR_ERR_CHANNEL_GROUP;
+                       /* If cg is NULL, only the SR_CONF_DEVICE_OPTIONS that are not
+                        * specific to a channel group must be returned. */
+                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+                                       devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
+                       return SR_OK;
                }
                if (cg == devc->digital_group) {
                        *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
@@ -983,9 +986,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;
 
@@ -1007,10 +1007,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);
@@ -1019,7 +1019,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;
@@ -1028,7 +1028,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;
@@ -1043,7 +1043,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;
 
@@ -1105,11 +1105,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);
Hardware access and backend lib