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 dee3d25cfdd952b88620c30e641ed7c0777ee572..6bd539ca29d10d29b64d65b5528c9c14a526ca11 100644 (file)
--- 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;
 
@@ -670,16 +667,6 @@ static int configure_channels(const struct sr_dev_inst *sdi)
                devc->channel_masks[devc->num_channels++] = channel_bit;
        }
 
-       if (devc->cur_channels & ~0xff) {
-               devc->unitsize = 2;
-       } else {
-#ifdef WORDS_BIGENDIAN
-               for (i = 0; i < devc->num_channels; i++)
-                       devc->channel_masks[i] >>= 8;
-#endif
-               devc->unitsize = 1;
-       }
-
        return SR_OK;
 }
 
@@ -739,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
@@ -786,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));
@@ -801,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);