X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fbaylibre-acme%2Fapi.c;h=cdf9968b20b94ad33217ebfa1c6f8ff93849d8be;hb=88a0265ebcb265ba839c02cc5bcd39e359c9f60f;hp=72e8f345b870d04d35a52cd6994eabc225bbdcb9;hpb=7a1a3a36a98eda90c2fe4a78326ea68afe94a041;p=libsigrok.git

diff --git a/src/hardware/baylibre-acme/api.c b/src/hardware/baylibre-acme/api.c
index 72e8f345..cdf9968b 100644
--- a/src/hardware/baylibre-acme/api.c
+++ b/src/hardware/baylibre-acme/api.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "protocol.h"
 #include <time.h>
 #include <sys/timerfd.h>
@@ -68,7 +69,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 	(void)options;
 
-	drvc = di->priv;
+	drvc = di->context;
 	devices = NULL;
 
 	devc = g_malloc0(sizeof(struct dev_context));
@@ -143,19 +144,13 @@ err_out:
 
 static GSList *dev_list(const struct sr_dev_driver *di)
 {
-	return ((struct drv_context *)(di->priv))->instances;
-}
-
-static int dev_clear(const struct sr_dev_driver *di)
-{
-	return std_dev_clear(di, NULL);
+	return ((struct drv_context *)(di->context))->instances;
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
 {
 	(void)sdi;
 
-	/* Nothing to do here. */
 	sdi->status = SR_ST_ACTIVE;
 
 	return SR_OK;
@@ -165,19 +160,11 @@ static int dev_close(struct sr_dev_inst *sdi)
 {
 	(void)sdi;
 
-	/* Nothing to do here. */
 	sdi->status = SR_ST_INACTIVE;
 
 	return SR_OK;
 }
 
-static int cleanup(const struct sr_dev_driver *di)
-{
-	dev_clear(di);
-
-	return SR_OK;
-}
-
 static int config_get(uint32_t key, GVariant **data,
 		      const struct sr_dev_inst *sdi,
 		      const struct sr_channel_group *cg)
@@ -348,7 +335,7 @@ static int dev_acquisition_open(const struct sr_dev_inst *sdi)
 	return 0;
 }
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 	struct itimerspec tspec = {
@@ -356,8 +343,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 		.it_value = { 0, 0 }
 	};
 
-	(void)cb_data;
-
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
@@ -391,20 +376,16 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	sr_session_source_add_channel(sdi->session, devc->channel,
 		G_IO_IN | G_IO_ERR, 1000, bl_acme_receive_data, (void *)sdi);
 
-	/* Send header packet to the session bus. */
 	std_session_send_df_header(sdi, LOG_PREFIX);
 	devc->start_time = g_get_monotonic_time();
 
 	return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	struct sr_datafeed_packet packet;
 	struct dev_context *devc;
 
-	(void)cb_data;
-
 	devc = sdi->priv;
 
 	if (sdi->status != SR_ST_ACTIVE)
@@ -415,14 +396,11 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 	g_io_channel_shutdown(devc->channel, FALSE, NULL);
 	g_io_channel_unref(devc->channel);
 	devc->channel = NULL;
-	close(devc->timer_fd);
 
-	/* Send last packet. */
-	packet.type = SR_DF_END;
-	sr_session_send(sdi, &packet);
+	std_session_send_df_end(sdi, LOG_PREFIX);
 
 	if (devc->samples_missed > 0)
-		sr_warn("%d samples missed", devc->samples_missed);
+		sr_warn("%" PRIu64 " samples missed", devc->samples_missed);
 
 	return SR_OK;
 }
@@ -432,10 +410,9 @@ SR_PRIV struct sr_dev_driver baylibre_acme_driver_info = {
 	.longname = "BayLibre ACME (Another Cute Measurement Equipment)",
 	.api_version = 1,
 	.init = init,
-	.cleanup = cleanup,
+	.cleanup = std_cleanup,
 	.scan = scan,
 	.dev_list = dev_list,
-	.dev_clear = dev_clear,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,
@@ -443,5 +420,5 @@ SR_PRIV struct sr_dev_driver baylibre_acme_driver_info = {
 	.dev_close = dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = dev_acquisition_stop,
-	.priv = NULL,
+	.context = NULL,
 };