Fix limit_samples check in various drivers.

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

diff --git a/hardware/serial-dmm/protocol.c b/hardware/serial-dmm/protocol.c
index 4fea8def3369e0c5e747dd502cd09eaa45745891..19b355386cc7bd7471933d6ca7009d124a73a655 100644 (file)
--- a/hardware/serial-dmm/protocol.c
+++ b/hardware/serial-dmm/protocol.c
@@ -153,6 +153,7 @@ static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data)
 {
        struct sr_dev_inst *sdi;
        struct dev_context *devc;
+       int64_t time;
        int ret;
 
        (void)fd;
@@ -177,12 +178,21 @@ static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data)
                }
        }
 
-       if (devc->num_samples >= devc->limit_samples) {
-               sr_info("Requested number of samples reached, stopping.");
+       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);
                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, cb_data);
+                       return TRUE;
+               }
+       }
+
        return TRUE;
 }
 
@@ -204,3 +214,4 @@ RECEIVE_DATA(PCE_PCE_DM32, fs9721)
 RECEIVE_DATA(RADIOSHACK_22_168, metex14)
 RECEIVE_DATA(RADIOSHACK_22_812, rs9lcd)
 RECEIVE_DATA(VOLTCRAFT_VC820, fs9721)
+RECEIVE_DATA(VOLTCRAFT_VC840, fs9721)