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

[libsigrok.git] / src / hardware / norma-dmm / protocol.c

diff --git a/src/hardware/norma-dmm/protocol.c b/src/hardware/norma-dmm/protocol.c
index 4dc717c9d0aa9967d992e306a385c0d7b4d813e6..60bae0b3460078f258a43a61de0b138630bb3c03 100644 (file)
--- a/src/hardware/norma-dmm/protocol.c
+++ b/src/hardware/norma-dmm/protocol.c
@@ -366,7 +366,7 @@ static void nma_process_line(const struct sr_dev_inst *sdi)
        memset(&packet, 0, sizeof(struct sr_datafeed_packet));
        packet.type = SR_DF_ANALOG_OLD;
        packet.payload = &analog;
-       sr_session_send(devc->cb_data, &packet);
+       sr_session_send(sdi, &packet);
 
        /* Finish processing. */
        devc->num_samples++;
@@ -414,14 +414,14 @@ SR_PRIV int norma_dmm_receive_data(int fd, int revents, void *cb_data)
        /* If number of samples or time limit reached, stop acquisition. */
        terminating = FALSE;
        if (devc->limit_samples && (devc->num_samples >= devc->limit_samples)) {
-               sdi->driver->dev_acquisition_stop(sdi, cb_data);
+               sdi->driver->dev_acquisition_stop(sdi);
                terminating = TRUE;
        }
 
        if (devc->limit_msec) {
                elapsed_s = g_timer_elapsed(devc->elapsed_msec, NULL);
                if ((elapsed_s * 1000) >= devc->limit_msec) {
-                       sdi->driver->dev_acquisition_stop(sdi, cb_data);
+                       sdi->driver->dev_acquisition_stop(sdi);
                        terminating = TRUE;
                }
        }