X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fsaleae-logic16%2Fapi.c;h=6bd539ca29d10d29b64d65b5528c9c14a526ca11;hb=102f12396660e0784134bccce5cc0679db325751;hp=8b2db4b49e065b9845e976559d735f70812d034d;hpb=a989cdbe03d8b5afae779dc97f14a76d7184638f;p=libsigrok.git

diff --git a/hardware/saleae-logic16/api.c b/hardware/saleae-logic16/api.c
index 8b2db4b4..6bd539ca 100644
--- a/hardware/saleae-logic16/api.c
+++ b/hardware/saleae-logic16/api.c
@@ -641,9 +641,6 @@ static int configure_channels(const struct sr_dev_inst *sdi)
 	struct sr_channel *ch;
 	GSList *l;
 	uint16_t channel_bit;
-#ifdef WORDS_BIGENDIAN
-	int i;
-#endif
 
 	devc = sdi->priv;
 
@@ -729,7 +726,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	devc->cur_channel = 0;
 	memset(devc->channel_data, 0, sizeof(devc->channel_data));
 
-	if ((trigger = sr_session_trigger_get())) {
+	if ((trigger = sr_session_trigger_get(sdi->session))) {
 		devc->stl = soft_trigger_logic_new(sdi, trigger);
 		devc->trigger_fired = FALSE;
 	} else
@@ -776,7 +773,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 		transfer = libusb_alloc_transfer(0);
 		libusb_fill_bulk_transfer(transfer, usb->devhdl,
 				2 | LIBUSB_ENDPOINT_IN, buf, size,
-				logic16_receive_transfer, devc, timeout);
+				logic16_receive_transfer, (void *)sdi, timeout);
 		if ((ret = libusb_submit_transfer(transfer)) != 0) {
 			sr_err("Failed to submit transfer: %s.",
 			       libusb_error_name(ret));
@@ -791,7 +788,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
 	devc->ctx = drvc->sr_ctx;
 
-	usb_source_add(devc->ctx, timeout, receive_data, (void *)sdi);
+	usb_source_add(sdi->session, devc->ctx, timeout, receive_data, (void *)sdi);
 
 	/* Send header packet to the session bus. */
 	std_session_send_df_header(cb_data, LOG_PREFIX);