X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ftesto%2Fapi.c;h=6e3511c013eb4bd76ec169e792a800a53547a834;hb=88a0265ebcb265ba839c02cc5bcd39e359c9f60f;hp=97aa7ac4fc9206b98ee95342a903e86319371729;hpb=3be42bc22f8b36599a448273c12a76d3e0f7a940;p=libsigrok.git

diff --git a/src/hardware/testo/api.c b/src/hardware/testo/api.c
index 97aa7ac4..6e3511c0 100644
--- a/src/hardware/testo/api.c
+++ b/src/hardware/testo/api.c
@@ -24,7 +24,7 @@
 #define SERIALCOMM "115200/8n1"
 
 SR_PRIV struct sr_dev_driver testo_driver_info;
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
+static int dev_acquisition_stop(struct sr_dev_inst *sdi);
 
 static const uint32_t scanopts[] = {
 	SR_CONF_CONN,
@@ -151,11 +151,6 @@ static GSList *dev_list(const struct sr_dev_driver *di)
 	return ((struct drv_context *)(di->context))->instances;
 }
 
-static int dev_clear(const struct sr_dev_driver *di)
-{
-	return std_dev_clear(di, NULL);
-}
-
 static int dev_open(struct sr_dev_inst *sdi)
 {
 	struct sr_dev_driver *di = sdi->driver;
@@ -230,20 +225,6 @@ static int dev_close(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-static int cleanup(const struct sr_dev_driver *di)
-{
-	int ret;
-	struct drv_context *drvc;
-
-	if (!(drvc = di->context))
-		return SR_OK;
-
-	ret = dev_clear(di);
-	g_free(drvc);
-
-	return ret;
-}
-
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg)
 {
@@ -363,7 +344,7 @@ static void receive_data(struct sr_dev_inst *sdi, unsigned char *data, int len)
 
 	devc->reply_size = 0;
 	if (devc->limit_samples && devc->num_samples >= devc->limit_samples)
-		dev_acquisition_stop(sdi, devc->cb_data);
+		dev_acquisition_stop(sdi);
 	else
 		testo_request_packet(sdi);
 
@@ -383,7 +364,7 @@ SR_PRIV void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
 
 	if (transfer->status == LIBUSB_TRANSFER_NO_DEVICE) {
 		/* USB device was unplugged. */
-		dev_acquisition_stop(sdi, devc->cb_data);
+		dev_acquisition_stop(sdi);
 	} else if (transfer->status == LIBUSB_TRANSFER_COMPLETED) {
 		/* First two bytes in any transfer are FTDI status bytes. */
 		if (transfer->actual_length > 2)
@@ -398,7 +379,7 @@ SR_PRIV void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
 			       libusb_error_name(ret));
 			g_free(transfer->buffer);
 			libusb_free_transfer(transfer);
-			dev_acquisition_stop(sdi, devc->cb_data);
+			dev_acquisition_stop(sdi);
 		}
 	} else {
 		/* This was the last transfer we're going to receive, so
@@ -428,7 +409,7 @@ static int handle_events(int fd, int revents, void *cb_data)
 	if (devc->limit_msec) {
 		now = g_get_monotonic_time() / 1000;
 		if (now > devc->end_time)
-			dev_acquisition_stop(sdi, devc->cb_data);
+			dev_acquisition_stop(sdi);
 	}
 
 	if (sdi->status == SR_ST_STOPPING) {
@@ -444,7 +425,7 @@ static int handle_events(int fd, int revents, void *cb_data)
 	return TRUE;
 }
 
-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_dev_driver *di = sdi->driver;
 	struct drv_context *drvc;
@@ -465,13 +446,11 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
 	devc = sdi->priv;
 	usb = sdi->conn;
-	devc->cb_data = cb_data;
 	devc->end_time = 0;
 	devc->num_samples = 0;
 	devc->reply_size = 0;
 
-	/* Send header packet to the session bus. */
-	std_session_send_df_header(cb_data, LOG_PREFIX);
+	std_session_send_df_header(sdi, LOG_PREFIX);
 
 	usb_source_add(sdi->session, drvc->sr_ctx, 100,
 			handle_events, (void *)sdi);
@@ -498,10 +477,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	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_dev_driver *di = sdi->driver;
-	(void)cb_data;
 
 	if (!di->context) {
 		sr_err("Driver was not initialized.");
@@ -521,10 +499,9 @@ SR_PRIV struct sr_dev_driver testo_driver_info = {
 	.longname = "Testo",
 	.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,