serial-dmm: Use software limit helpers

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

diff --git a/src/hardware/serial-dmm/protocol.c b/src/hardware/serial-dmm/protocol.c
index 1e343a2f3f89254923965dc77a352888069a5aaf..3ea85be5461bc014938c4c37955fd72990ea3792 100644 (file)
--- a/src/hardware/serial-dmm/protocol.c
+++ b/src/hardware/serial-dmm/protocol.c
@@ -70,7 +70,7 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
                packet.type = SR_DF_ANALOG_OLD;
                packet.payload = &analog;
                sr_session_send(sdi, &packet);
-               devc->num_samples++;
+               sr_sw_limits_update_samples_read(&devc->limits, 1);
        }
 }
 
@@ -160,7 +160,6 @@ int receive_data(int fd, int revents, void *cb_data)
        struct sr_dev_inst *sdi;
        struct dev_context *devc;
        struct dmm_info *dmm;
-       int64_t time;
        void *info;
 
        (void)fd;
@@ -184,20 +183,8 @@ int receive_data(int fd, int revents, void *cb_data)
                        return FALSE;
        }
 
-       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);
-               return TRUE;
-       }
-
-       if (devc->limit_msec) {
-               time = (g_get_monotonic_time() - devc->starttime) / 1000;
-               if (time > (int64_t)devc->limit_msec) {
-                       sr_info("Requested time limit reached.");
-                       sdi->driver->dev_acquisition_stop(sdi);
-                       return TRUE;
-               }
-       }
 
        return TRUE;
 }