X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fapi.c;h=606dc2be03f3bacf84a3aa31d97f509cea3a0438;hb=f1ba6b4b2c9a8ecf90bb31efb218752aa7e49d1a;hp=bcc24898b4192ca023944b992d51d899fc68fe4b;hpb=7b365c47198890da8541a6daf04697c7c7ac88d4;p=libsigrok.git

diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c
index bcc24898..606dc2be 100644
--- a/src/hardware/yokogawa-dlm/api.c
+++ b/src/hardware/yokogawa-dlm/api.c
@@ -141,27 +141,18 @@ static int dev_clear(const struct sr_dev_driver *di)
 
 static int dev_open(struct sr_dev_inst *sdi)
 {
-	if (sdi->status != SR_ST_ACTIVE && sr_scpi_open(sdi->conn) != SR_OK)
+	if (sr_scpi_open(sdi->conn) != SR_OK)
 		return SR_ERR;
 
 	if (dlm_scope_state_query(sdi) != SR_OK)
 		return SR_ERR;
 
-	sdi->status = SR_ST_ACTIVE;
-
 	return SR_OK;
 }
 
 static int dev_close(struct sr_dev_inst *sdi)
 {
-	if (sdi->status == SR_ST_INACTIVE)
-		return SR_OK;
-
-	sr_scpi_close(sdi->conn);
-
-	sdi->status = SR_ST_INACTIVE;
-
-	return SR_OK;
+	return sr_scpi_close(sdi->conn);
 }
 
 /**
@@ -488,7 +479,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 +501,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) {
@@ -612,9 +603,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	struct dev_context *devc;
 	struct sr_scpi_dev_inst *scpi;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	scpi = sdi->conn;
 	devc = sdi->priv;
 	digital_added = FALSE;
@@ -660,9 +648,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;