Add struct sr_session parameter to all session source backends.

[libsigrok.git] / hardware / saleae-logic16 / api.c

diff --git a/hardware/saleae-logic16/api.c b/hardware/saleae-logic16/api.c
index 2a493f9012212c125580a0aa99237123a4992307..6bd539ca29d10d29b64d65b5528c9c14a526ca11 100644 (file)
--- a/hardware/saleae-logic16/api.c
+++ b/hardware/saleae-logic16/api.c
@@ -726,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
@@ -773,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));
@@ -788,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);