norma-dmm: Use software limit helpers

[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 a077cf983b05ef392a642f322ebe9991fab0852e..7e0f2a10834f7fe0fbacc1e0a3026537ede21311 100644 (file)
--- a/src/hardware/norma-dmm/protocol.c
+++ b/src/hardware/norma-dmm/protocol.c
@@ -30,7 +30,7 @@
 SR_PRIV const struct nmadmm_req nmadmm_requests[] = {
        { NMADMM_REQ_IDN, "IDN?" },
        { NMADMM_REQ_IDN, "STATUS?" },
-       { 0, NULL },
+       ALL_ZERO
 };
 
 static int nma_send_req(const struct sr_dev_inst *sdi, int req, char *params)
@@ -366,10 +366,10 @@ 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++;
+       sr_sw_limits_update_samples_read(&devc->limits, 1);
        devc->buflen = 0;
 }
 
@@ -379,8 +379,6 @@ SR_PRIV int norma_dmm_receive_data(int fd, int revents, void *cb_data)
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
        int len;
-       gboolean terminating;
-       gdouble elapsed_s;
 
        (void)fd;
 
@@ -411,23 +409,10 @@ 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);
-               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);
-                       terminating = TRUE;
-               }
-       }
-
-       /* Request next package. */
-       if (!terminating) {
+       if (sr_sw_limits_check(&devc->limits)) {
+               sdi->driver->dev_acquisition_stop(sdi);
+       } else {
+               /* Request next package. */
                if (devc->last_req_pending) {
                        gint64 elapsed_us = g_get_monotonic_time() - devc->req_sent_at;
                        if (elapsed_us > NMADMM_TIMEOUT_MS * 1000) {/* Timeout! */