Add sr_dev_acquisition_stop(), factor out SR_ERR_DEV_CLOSED check.

[libsigrok.git] / src / hardware / yokogawa-dlm / api.c

diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c
index bcc24898b4192ca023944b992d51d899fc68fe4b..e11587e6ced551c77a340893cd392ff19b3d5404 100644 (file)
--- a/src/hardware/yokogawa-dlm/api.c
+++ b/src/hardware/yokogawa-dlm/api.c
@@ -488,7 +488,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
        struct dev_context *devc = NULL;
        const struct scope_config *model = NULL;
 
-       /* SR_CONF_SCAN_OPTIONS is always valid, regardless of sdi or probe group. */
+       /* 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,
                                dlm_scanopts, ARRAY_SIZE(dlm_scanopts), sizeof(uint32_t));
@@ -510,7 +510,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 
        /*
         * If cg is NULL, only the SR_CONF_DEVICE_OPTIONS that are not
-        * specific to a probe group must be returned.
+        * specific to a channel group must be returned.
         */
        if (!cg) {
                switch (key) {
@@ -660,9 +660,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 
        std_session_send_df_end(sdi);
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        devc = sdi->priv;
 
        devc->num_frames = 0;