X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flascar-el-usb%2Fapi.c;h=6244172098f4eed6bdabab0294e80cb93e702d11;hb=700d6b64d578ce10e57f6a2289e37a5564eccf1c;hp=40a4164943282cd90e076a0b3cf8865b1169a798;hpb=41812aca436805b0614f2a8f31cf2f8ce494aea0;p=libsigrok.git

diff --git a/src/hardware/lascar-el-usb/api.c b/src/hardware/lascar-el-usb/api.c
index 40a41649..62441720 100644
--- a/src/hardware/lascar-el-usb/api.c
+++ b/src/hardware/lascar-el-usb/api.c
@@ -17,9 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <glib.h>
 #include <libusb.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
@@ -143,21 +144,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))
-		/* Can get called on an unused driver, doesn't matter. */
-		return SR_OK;
-
-	ret = std_dev_clear(di, NULL);
-	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)
 {
@@ -322,7 +308,7 @@ static int lascar_proc_config(const struct sr_dev_inst *sdi)
 	return ret;
 }
 
-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 sr_datafeed_packet packet;
@@ -348,28 +334,25 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	drvc = di->context;
 	devc = sdi->priv;
 	usb = sdi->conn;
-	devc->cb_data = cb_data;
 
 	if (lascar_proc_config(sdi) != SR_OK)
 		return SR_ERR;
 
 	sr_dbg("Starting log retrieval.");
 
-	/* Send header packet to the session bus. */
-	std_session_send_df_header(cb_data, LOG_PREFIX);
+	std_session_send_df_header(sdi, LOG_PREFIX);
 
 	interval = (devc->config[0x1c] | (devc->config[0x1d] << 8)) * 1000;
 	packet.type = SR_DF_META;
 	packet.payload = &meta;
 	src = sr_config_new(SR_CONF_SAMPLE_INTERVAL, g_variant_new_uint64(interval));
 	meta.config = g_slist_append(NULL, src);
-	sr_session_send(devc->cb_data, &packet);
+	sr_session_send(sdi, &packet);
 	g_free(src);
 
 	if (devc->logged_samples == 0) {
 		/* This ensures the frontend knows the session is done. */
-		packet.type = SR_DF_END;
-		sr_session_send(devc->cb_data, &packet);
+		std_session_send_df_end(sdi, LOG_PREFIX);
 		return SR_OK;
 	}
 
@@ -415,7 +398,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 		libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
 	}
 	if (xfer_in->user_data != GINT_TO_POINTER(1) ||
-			xfer_in->user_data != GINT_TO_POINTER(1)) {
+			xfer_out->user_data != GINT_TO_POINTER(1)) {
 		sr_dbg("no response to log transfer request");
 		libusb_free_transfer(xfer_in);
 		libusb_free_transfer(xfer_out);
@@ -435,7 +418,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
 	buf = g_malloc(4096);
 	libusb_fill_bulk_transfer(xfer_in, usb->devhdl, LASCAR_EP_IN,
-			buf, 4096, lascar_el_usb_receive_transfer, cb_data, 100);
+			buf, 4096, lascar_el_usb_receive_transfer,
+			(struct sr_dev_inst *)sdi, 100);
 	if ((ret = libusb_submit_transfer(xfer_in) != 0)) {
 		sr_err("Unable to submit transfer: %s.", libusb_error_name(ret));
 		libusb_free_transfer(xfer_in);
@@ -446,10 +430,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	return SR_OK;
 }
 
-SR_PRIV int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+SR_PRIV 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.");
@@ -472,7 +455,7 @@ SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info = {
 	.longname = "Lascar EL-USB",
 	.api_version = 1,
 	.init = init,
-	.cleanup = cleanup,
+	.cleanup = std_cleanup,
 	.scan = scan,
 	.dev_list = dev_list,
 	.dev_clear = NULL,