X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fappa-55ii%2Fapi.c;h=cdf30af8bf850a3d5c052d0a52ec2c0a3c54540c;hb=c01bf34ca264b268fee2e71ab918c71d28dc3018;hp=86f78543cd686b47a2ed54991fead49a70053aa4;hpb=1c47e0da8f2571bc34dbdc368c3c1f55318c3aa0;p=libsigrok.git

diff --git a/src/hardware/appa-55ii/api.c b/src/hardware/appa-55ii/api.c
index 86f78543..cdf30af8 100644
--- a/src/hardware/appa-55ii/api.c
+++ b/src/hardware/appa-55ii/api.c
@@ -121,16 +121,6 @@ scan_cleanup:
 	return devices;
 }
 
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
-	return ((struct drv_context *)(di->context))->instances;
-}
-
-static int cleanup(const struct sr_dev_driver *di)
-{
-	return std_dev_clear(di, NULL);
-}
-
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg)
 {
@@ -225,8 +215,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 	return SR_OK;
 }
 
-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 sr_serial_dev_inst *serial;
 	struct dev_context *devc;
@@ -235,12 +224,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
-	if (!(devc = sdi->priv)) {
-		sr_err("sdi->priv was NULL.");
-		return SR_ERR_BUG;
-	}
-
-	devc->session_cb_data = cb_data;
+	devc = sdi->priv;
 
 	/*
 	 * Reset the number of samples to take. If we've already collected our
@@ -250,7 +234,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 	devc->num_samples = 0;
 	devc->start_time = g_get_monotonic_time();
 
-	std_session_send_df_header(cb_data, LOG_PREFIX);
+	std_session_send_df_header(sdi, LOG_PREFIX);
 
 	/* Poll every 50ms, or whenever some data comes in. */
 	serial_source_add(sdi->session, serial, G_IO_IN, 50,
@@ -259,9 +243,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 	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)
 {
-	return std_serial_dev_acquisition_stop(sdi, cb_data,
+	return std_serial_dev_acquisition_stop(sdi,
 			std_serial_dev_close, sdi->conn, LOG_PREFIX);
 }
 
@@ -270,9 +254,9 @@ SR_PRIV struct sr_dev_driver appa_55ii_driver_info = {
 	.longname = "APPA 55II",
 	.api_version = 1,
 	.init = init,
-	.cleanup = cleanup,
+	.cleanup = std_cleanup,
 	.scan = scan,
-	.dev_list = dev_list,
+	.dev_list = std_dev_list,
 	.dev_clear = NULL,
 	.config_get = config_get,
 	.config_set = config_set,