X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbaylibre-acme%2Fapi.c;h=93570f93ea3366247135f179e90252d5ae6aee8e;hb=6e43c3d5318a8ff320bf6539a9efe7f0b8497e2f;hp=ed21b921eae0f264ecb02806ba78bba93c94c0ae;hpb=43376f3324cddd257a0260b06d9db8180c35fdf3;p=libsigrok.git

diff --git a/src/hardware/baylibre-acme/api.c b/src/hardware/baylibre-acme/api.c
index ed21b921..93570f93 100644
--- a/src/hardware/baylibre-acme/api.c
+++ b/src/hardware/baylibre-acme/api.c
@@ -126,24 +126,6 @@ err_out:
 	return NULL;
 }
 
-static int dev_open(struct sr_dev_inst *sdi)
-{
-	(void)sdi;
-
-	sdi->status = SR_ST_ACTIVE;
-
-	return SR_OK;
-}
-
-static int dev_close(struct sr_dev_inst *sdi)
-{
-	(void)sdi;
-
-	sdi->status = SR_ST_INACTIVE;
-
-	return SR_OK;
-}
-
 static int config_get(uint32_t key, GVariant **data,
 		      const struct sr_dev_inst *sdi,
 		      const struct sr_channel_group *cg)
@@ -193,9 +175,6 @@ static int config_set(uint32_t key, GVariant *data,
 	uint64_t samplerate;
 	int ret;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	devc = sdi->priv;
 
 	ret = SR_OK;
@@ -316,9 +295,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 		.it_value = { 0, 0 }
 	};
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	if (dev_acquisition_open(sdi))
 		return SR_ERR;
 
@@ -348,7 +324,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	sr_session_source_add_channel(sdi->session, devc->channel,
 		G_IO_IN | G_IO_ERR, 1000, bl_acme_receive_data, (void *)sdi);
 
-	std_session_send_df_header(sdi, LOG_PREFIX);
+	std_session_send_df_header(sdi);
 	sr_sw_limits_acquisition_start(&devc->limits);
 
 	return SR_OK;
@@ -360,16 +336,13 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 
 	devc = sdi->priv;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	dev_acquisition_close(sdi);
 	sr_session_source_remove_channel(sdi->session, devc->channel);
 	g_io_channel_shutdown(devc->channel, FALSE, NULL);
 	g_io_channel_unref(devc->channel);
 	devc->channel = NULL;
 
-	std_session_send_df_end(sdi, LOG_PREFIX);
+	std_session_send_df_end(sdi);
 
 	if (devc->samples_missed > 0)
 		sr_warn("%" PRIu64 " samples missed", devc->samples_missed);
@@ -388,8 +361,8 @@ static struct sr_dev_driver baylibre_acme_driver_info = {
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,
-	.dev_open = dev_open,
-	.dev_close = dev_close,
+	.dev_open = std_dummy_dev_open,
+	.dev_close = std_dummy_dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = dev_acquisition_stop,
 	.context = NULL,