X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhung-chang-dso-2100%2Fapi.c;h=0aa012a1a3b54e90d1ed3a15137aa565e8eefac0;hb=f1ba6b4b2c9a8ecf90bb31efb218752aa7e49d1a;hp=bad92c00b8f7344517866da9573d28cc72e8815f;hpb=276d7b18bbe71d061544c2d2989330b38ce86df3;p=libsigrok.git

diff --git a/src/hardware/hung-chang-dso-2100/api.c b/src/hardware/hung-chang-dso-2100/api.c
index bad92c00..0aa012a1 100644
--- a/src/hardware/hung-chang-dso-2100/api.c
+++ b/src/hardware/hung-chang-dso-2100/api.c
@@ -246,9 +246,6 @@ static int dev_open(struct sr_dev_inst *sdi)
 	struct dev_context *devc = sdi->priv;
 	int i;
 
-	if (sdi->status != SR_ST_INACTIVE)
-		goto fail1;
-
 	if (ieee1284_open(sdi->conn, 0, &i) != E1284_OK)
 		goto fail1;
 
@@ -265,8 +262,6 @@ static int dev_open(struct sr_dev_inst *sdi)
 	if (!devc->samples)
 		goto fail3;
 
-	sdi->status = SR_ST_ACTIVE;
-
 	return SR_OK;
 
 fail3:
@@ -282,14 +277,10 @@ static int dev_close(struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc = sdi->priv;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_OK;
-
 	g_free(devc->samples);
 	hung_chang_dso_2100_reset_port(sdi->conn);
 	ieee1284_release(sdi->conn);
 	ieee1284_close(sdi->conn);
-	sdi->status = SR_ST_INACTIVE;
 
 	return SR_OK;
 }
@@ -434,9 +425,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 	if (cg) /* sr_config_set will validate cg using config_list */
 		ch = ((struct sr_channel *)cg->channels->data)->index;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	ret = SR_OK;
 	switch (key) {
 	case SR_CONF_LIMIT_FRAMES:
@@ -549,9 +537,6 @@ static int config_commit(const struct sr_dev_inst *sdi)
 	uint8_t state = hung_chang_dso_2100_read_mbox(sdi->conn, 0.02);
 	int ret;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	switch (state) {
 	case 0x03:
 	case 0x14:
@@ -664,9 +649,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	struct dev_context *devc = sdi->priv;
 	int ret;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	if (devc->channel) {
 		static const float res_array[] = {0.5, 1, 2, 5};
 		static const uint8_t relays[] = {100, 10, 10, 1};
@@ -692,11 +674,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-SR_PRIV int hung_chang_dso_2100_dev_acquisition_stop(const struct sr_dev_inst *sdi)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	std_session_send_df_end(sdi);
 	sr_session_source_remove(sdi->session, -1);
 	hung_chang_dso_2100_move_to(sdi, 1);
@@ -704,11 +683,6 @@ SR_PRIV int hung_chang_dso_2100_dev_acquisition_stop(const struct sr_dev_inst *s
 	return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-	return hung_chang_dso_2100_dev_acquisition_stop(sdi);
-}
-
 static struct sr_dev_driver hung_chang_dso_2100_driver_info = {
 	.name = "hung-chang-dso-2100",
 	.longname = "Hung-Chang DSO-2100",