std_init(): Drop check if pass in driver is non-NULL

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

diff --git a/src/hardware/brymen-dmm/protocol.c b/src/hardware/brymen-dmm/protocol.c
index 4db460afd63c255fcdcd7f0edeb72e5cedd27517..3e1b84c421834030b777fe1b9fd7ee347bbd5e2f 100644 (file)
--- a/src/hardware/brymen-dmm/protocol.c
+++ b/src/hardware/brymen-dmm/protocol.c
@@ -42,8 +42,8 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi)
                /* Got a measurement. */
                packet.type = SR_DF_ANALOG_OLD;
                packet.payload = &analog;
-               sr_session_send(devc->cb_data, &packet);
-               devc->num_samples++;
+               sr_session_send(sdi, &packet);
+               sr_sw_limits_update_samples_read(&devc->sw_limits, 1);
        }
 }
 
@@ -114,7 +114,6 @@ SR_PRIV int brymen_dmm_receive_data(int fd, int revents, void *cb_data)
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
        int ret;
-       int64_t time;
 
        (void)fd;
 
@@ -137,20 +136,8 @@ SR_PRIV int brymen_dmm_receive_data(int fd, int revents, void *cb_data)
                }
        }
 
-       if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
-               sr_info("Requested number of samples reached, stopping.");
-               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, stopping.");
-                       sdi->driver->dev_acquisition_stop(sdi, cb_data);
-                       return TRUE;
-               }
-       }
+       if (sr_sw_limits_check(&devc->sw_limits))
+               sdi->driver->dev_acquisition_stop(sdi);
 
        return TRUE;
 }