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

[libsigrok.git] / src / hardware / zeroplus-logic-cube / api.c

diff --git a/src/hardware/zeroplus-logic-cube/api.c b/src/hardware/zeroplus-logic-cube/api.c
index 3681352e73e058828ec03e4cb7b800b80e554eef..22ec33b544ac3d8218b9bb0fe960d3254f63cd0e 100644 (file)
--- a/src/hardware/zeroplus-logic-cube/api.c
+++ b/src/hardware/zeroplus-logic-cube/api.c
@@ -512,8 +512,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
        return SR_OK;
 }
 
-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 dev_context *devc;
        struct sr_usb_dev_inst *usb;
@@ -538,10 +537,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
-       if (!(devc = sdi->priv)) {
-               sr_err("%s: sdi->priv was NULL", __func__);
-               return SR_ERR_ARG;
-       }
+       devc = sdi->priv;
 
        if (analyzer_add_triggers(sdi) != SR_OK) {
                sr_err("Failed to configure triggers.");
@@ -578,12 +574,11 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
        sr_info("Ramsize trigger    = 0x%x.", ramsize_trigger);
        sr_info("Memory size        = 0x%x.", memory_size);
 
-       /* Send header packet to the session bus. */
-       std_session_send_df_header(cb_data, LOG_PREFIX);
+       std_session_send_df_header(sdi, LOG_PREFIX);
 
        /* Check for empty capture */
        if ((status & STATUS_READY) && !stop_address) {
-               std_session_send_df_end(cb_data, LOG_PREFIX);
+               std_session_send_df_end(sdi, LOG_PREFIX);
                return SR_OK;
        }
 
@@ -666,7 +661,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
                        logic.length = (trigger_offset - samples_read) * 4;
                        logic.unitsize = 4;
                        logic.data = buf + buf_offset;
-                       sr_session_send(cb_data, &packet);
+                       sr_session_send(sdi, &packet);
                        len -= logic.length;
                        samples_read += logic.length / 4;
                        buf_offset += logic.length;
@@ -676,7 +671,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
                        /* Send out trigger */
                        packet.type = SR_DF_TRIGGER;
                        packet.payload = NULL;
-                       sr_session_send(cb_data, &packet);
+                       sr_session_send(sdi, &packet);
                }
 
                /* Send out data (or data after trigger) */
@@ -685,24 +680,24 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
                logic.length = len;
                logic.unitsize = 4;
                logic.data = buf + buf_offset;
-               sr_session_send(cb_data, &packet);
+               sr_session_send(sdi, &packet);
                samples_read += len / 4;
        }
        analyzer_read_stop(usb->devhdl);
        g_free(buf);
 
-       std_session_send_df_end(cb_data, LOG_PREFIX);
+       std_session_send_df_end(sdi, LOG_PREFIX);
 
        return SR_OK;
 }
 
 /* TODO: This stops acquisition on ALL devices, ignoring dev_index. */
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
        struct sr_usb_dev_inst *usb;
 
-       std_session_send_df_end(cb_data, LOG_PREFIX);
+       std_session_send_df_end(sdi, LOG_PREFIX);
 
        if (!(devc = sdi->priv)) {
                sr_err("%s: sdi->priv was NULL", __func__);