dev_acquisition_{start,stop}(): Drop duplicate 'cb_data' parameter.

[libsigrok.git] / src / hardware / ikalogic-scanaplus / protocol.c

diff --git a/src/hardware/ikalogic-scanaplus/protocol.c b/src/hardware/ikalogic-scanaplus/protocol.c
index 0b81ebde211ece7f2ac01dd2871c787085289117..9e9b0ea5ca08a96dcadbb3554848380e23becd07 100644 (file)
--- a/src/hardware/ikalogic-scanaplus/protocol.c
+++ b/src/hardware/ikalogic-scanaplus/protocol.c
@@ -107,10 +107,13 @@ static void scanaplus_uncompress_block(struct dev_context *devc,
        }
 }
 
-static void send_samples(struct dev_context *devc, uint64_t samples_to_send)
+static void send_samples(const struct sr_dev_inst *sdi, uint64_t samples_to_send)
 {
        struct sr_datafeed_packet packet;
        struct sr_datafeed_logic logic;
+       struct dev_context *devc;
+
+       devc = sdi->priv;
 
        sr_spew("Sending %" PRIu64 " samples.", samples_to_send);
 
@@ -119,7 +122,7 @@ static void send_samples(struct dev_context *devc, uint64_t samples_to_send)
        logic.length = samples_to_send * 2;
        logic.unitsize = 2; /* We need 2 bytes for 9 channels. */
        logic.data = devc->sample_buf;
-       sr_session_send(devc->cb_data, &packet);
+       sr_session_send(sdi, &packet);
 
        devc->samples_sent += samples_to_send;
        devc->bytes_received -= samples_to_send * 2;
@@ -317,7 +320,7 @@ SR_PRIV int scanaplus_receive_data(int fd, int revents, void *cb_data)
        if (bytes_read < 0) {
                sr_err("Failed to read FTDI data (%d): %s.",
                       bytes_read, ftdi_get_error_string(devc->ftdic));
-               sdi->driver->dev_acquisition_stop(sdi, sdi);
+               sdi->driver->dev_acquisition_stop(sdi);
                return FALSE;
        }
        if (bytes_read == 0) {
@@ -354,17 +357,17 @@ SR_PRIV int scanaplus_receive_data(int fd, int revents, void *cb_data)
        max = (SR_MHZ(100) / 1000) * devc->limit_msec;
 
        if (devc->limit_samples && (n >= devc->limit_samples)) {
-               send_samples(devc, devc->limit_samples - devc->samples_sent);
+               send_samples(sdi, devc->limit_samples - devc->samples_sent);
                sr_info("Requested number of samples reached.");
-               sdi->driver->dev_acquisition_stop(sdi, cb_data);
+               sdi->driver->dev_acquisition_stop(sdi);
                return TRUE;
        } else if (devc->limit_msec && (n >= max)) {
-               send_samples(devc, max - devc->samples_sent);
+               send_samples(sdi, max - devc->samples_sent);
                sr_info("Requested time limit reached.");
-               sdi->driver->dev_acquisition_stop(sdi, cb_data);
+               sdi->driver->dev_acquisition_stop(sdi);
                return TRUE;
        } else {
-               send_samples(devc, devc->bytes_received / 2);
+               send_samples(sdi, devc->bytes_received / 2);
        }
 
        return TRUE;