link-mso19: Drop unnecessary NULL check

[libsigrok.git] / src / hardware / maynuo-m97 / protocol.c

diff --git a/src/hardware/maynuo-m97/protocol.c b/src/hardware/maynuo-m97/protocol.c
index 085d379f1c36635a0c07876329c4c8529bd5b924..7782d48f794b280c1c9bfc0957bb8089b2c521ee 100644 (file)
--- a/src/hardware/maynuo-m97/protocol.c
+++ b/src/hardware/maynuo-m97/protocol.c
@@ -164,7 +164,6 @@ SR_PRIV int maynuo_m97_receive_data(int fd, int revents, void *cb_data)
        struct sr_modbus_dev_inst *modbus;
        struct sr_datafeed_packet packet;
        uint16_t registers[4];
-       int64_t t;
 
        (void)fd;
        (void)revents;
@@ -178,7 +177,7 @@ SR_PRIV int maynuo_m97_receive_data(int fd, int revents, void *cb_data)
        devc->expecting_registers = 0;
        if (sr_modbus_read_holding_registers(modbus, -1, 4, registers) == SR_OK) {
                packet.type = SR_DF_FRAME_BEGIN;
-               sr_session_send(cb_data, &packet);
+               sr_session_send(sdi, &packet);
 
                maynuo_m97_session_send_value(sdi, sdi->channels->data,
                                              RBFL(registers + 0),
@@ -188,25 +187,15 @@ SR_PRIV int maynuo_m97_receive_data(int fd, int revents, void *cb_data)
                                              SR_MQ_CURRENT, SR_UNIT_AMPERE);
 
                packet.type = SR_DF_FRAME_END;
-               sr_session_send(cb_data, &packet);
-               devc->num_samples++;
+               sr_session_send(sdi, &packet);
+               sr_sw_limits_update_samples_read(&devc->limits, 1);
        }
 
-       if (devc->limit_samples && (devc->num_samples >= devc->limit_samples)) {
-               sr_info("Requested number of samples reached.");
-               sdi->driver->dev_acquisition_stop(sdi, cb_data);
+       if (sr_sw_limits_check(&devc->limits)) {
+               sdi->driver->dev_acquisition_stop(sdi);
                return TRUE;
        }
 
-       if (devc->limit_msec) {
-               t = (g_get_monotonic_time() - devc->starttime) / 1000;
-               if (t > (int64_t)devc->limit_msec) {
-                       sr_info("Requested time limit reached.");
-                       sdi->driver->dev_acquisition_stop(sdi, cb_data);
-                       return TRUE;
-               }
-       }
-
        maynuo_m97_capture_start(sdi);
        return TRUE;
 }