Remove unnecessary std_serial_dev_acquisition_stop() wrappers

[libsigrok.git] / src / hardware / kern-scale / protocol.c

diff --git a/src/hardware/kern-scale/protocol.c b/src/hardware/kern-scale/protocol.c
index 182a9d80b03da39f4e30dfe095b6288b6af0cdc4..0af2adde405bf8ea2334ae5ee12db0b71888e64d 100644 (file)
--- a/src/hardware/kern-scale/protocol.c
+++ b/src/hardware/kern-scale/protocol.c
@@ -33,14 +33,14 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
        struct scale_info *scale;
        float floatval;
        struct sr_datafeed_packet packet;
-       struct sr_datafeed_analog analog;
+       struct sr_datafeed_analog_old analog;
        struct dev_context *devc;
 
        scale = (struct scale_info *)sdi->driver;
 
        devc = sdi->priv;
 
-       memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+       memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
 
        analog.channels = sdi->channels;
        analog.num_samples = 1;
@@ -51,10 +51,10 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
 
        if (analog.mq != -1) {
                /* Got a measurement. */
-               packet.type = SR_DF_ANALOG;
+               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->limits, 1);
        }
 }
 
@@ -102,7 +102,6 @@ SR_PRIV int kern_scale_receive_data(int fd, int revents, void *cb_data)
        struct sr_dev_inst *sdi;
        struct dev_context *devc;
        struct scale_info *scale;
-       int64_t time;
        void *info;
 
        (void)fd;
@@ -122,20 +121,8 @@ SR_PRIV int kern_scale_receive_data(int fd, int revents, void *cb_data)
                g_free(info);
        }
 
-       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;
-               }
-       }
+       if (sr_sw_limits_check(&devc->limits))
+               sdi->driver->dev_acquisition_stop(sdi);
 
        return TRUE;
 }