uni-t-dmm: Use software limit helpers

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

diff --git a/src/hardware/uni-t-dmm/protocol.c b/src/hardware/uni-t-dmm/protocol.c
index c417ea153629daae86d5efb28ea01be69d86bc07..f0b3997695a9591f8bf3913f1833124e50f0ecf9 100644 (file)
--- a/src/hardware/uni-t-dmm/protocol.c
+++ b/src/hardware/uni-t-dmm/protocol.c
@@ -89,8 +89,7 @@ static void decode_packet(struct sr_dev_inst *sdi, const uint8_t *buf)
        packet.payload = &analog;
        sr_session_send(sdi, &packet);
 
-       /* Increase sample count. */
-       devc->num_samples++;
+       sr_sw_limits_update_samples_read(&devc->limits, 1);
 }
 
 static int hid_chip_init(struct sr_dev_inst *sdi, uint16_t baudrate)
@@ -274,7 +273,6 @@ SR_PRIV int uni_t_dmm_receive_data(int fd, int revents, void *cb_data)
        int ret;
        struct sr_dev_inst *sdi;
        struct dev_context *devc;
-       int64_t time_ms;
 
        (void)fd;
        (void)revents;
@@ -286,19 +284,8 @@ SR_PRIV int uni_t_dmm_receive_data(int fd, int revents, void *cb_data)
                return FALSE;
 
        /* Abort acquisition if we acquired enough samples. */
-       if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
-               sr_info("Requested number of samples reached.");
+       if (sr_sw_limits_check(&devc->limits))
                sdi->driver->dev_acquisition_stop(sdi);
-       }
-
-       if (devc->limit_msec) {
-               time_ms = (g_get_monotonic_time() - devc->starttime) / 1000;
-               if (time_ms > (int64_t)devc->limit_msec) {
-                       sr_info("Requested time limit reached.");
-                       sdi->driver->dev_acquisition_stop(sdi);
-                       return TRUE;
-               }
-       }
 
        return TRUE;
 }