baylibre-acme: Use software limit helpers

[libsigrok.git] / src / hardware / baylibre-acme / protocol.c

diff --git a/src/hardware/baylibre-acme/protocol.c b/src/hardware/baylibre-acme/protocol.c
index 6726667ed78d3d29888d4d4bb8ed927de8608de6..ea25d95b00fcb3add71053454df369fd33363c32 100644 (file)
--- a/src/hardware/baylibre-acme/protocol.c
+++ b/src/hardware/baylibre-acme/protocol.c
@@ -167,6 +167,7 @@ SR_PRIV gboolean bl_acme_detect_probe(unsigned int addr,
                sr_dbg("Name for probe %d can't be read: %s",
                       prb_num, err->message);
                g_string_free(path, TRUE);
+               g_error_free(err);
                return ret;
        }
 
@@ -201,6 +202,7 @@ static int get_hwmon_index(unsigned int addr)
        if (!dir) {
                sr_err("Error opening %s: %s", path->str, err->message);
                g_string_free(path, TRUE);
+               g_error_free(err);
                return -1;
        }
 
@@ -277,7 +279,7 @@ static int read_probe_eeprom(unsigned int addr, struct probe_eeprom *eeprom)
                return -1;
 
        rd = read(fd, eeprom_buf, EEPROM_SIZE);
-       g_close(fd, NULL);
+       close(fd);
        if (rd != EEPROM_SIZE)
                return -1;
 
@@ -484,6 +486,7 @@ SR_PRIV int bl_acme_get_shunt(const struct sr_channel_group *cg,
        if (!status) {
                sr_err("Error reading shunt resistance: %s", err->message);
                ret = SR_ERR_IO;
+               g_error_free(err);
                goto out;
        }
 
@@ -694,7 +697,6 @@ SR_PRIV void bl_acme_close_channel(struct sr_channel *ch)
 
 SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
 {
-       uint32_t cur_time, elapsed_time;
        uint64_t nrexpiration;
        struct sr_datafeed_packet packet, framep;
        struct sr_datafeed_analog_old analog;
@@ -750,7 +752,7 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
         */
        for (i = 0; i < nrexpiration; i++) {
                framep.type = SR_DF_FRAME_BEGIN;
-               sr_session_send(cb_data, &framep);
+               sr_session_send(sdi, &framep);
 
                /*
                 * Due to different units used in each channel we're sending
@@ -773,30 +775,18 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
                                chp->val = read_sample(ch);
 
                        analog.data = &chp->val;
-                       sr_session_send(cb_data, &packet);
+                       sr_session_send(sdi, &packet);
                }
 
                framep.type = SR_DF_FRAME_END;
-               sr_session_send(cb_data, &framep);
+               sr_session_send(sdi, &framep);
        }
 
-       devc->samples_read++;
-       if (devc->limit_samples > 0 &&
-           devc->samples_read >= devc->limit_samples) {
-               sr_info("Requested number of samples reached.");
-               sdi->driver->dev_acquisition_stop(sdi, cb_data);
-               devc->last_sample_fin = g_get_monotonic_time();
+       sr_sw_limits_update_samples_read(&devc->limits, 1);
+
+       if (sr_sw_limits_check(&devc->limits)) {
+               sdi->driver->dev_acquisition_stop(sdi);
                return TRUE;
-       } else if (devc->limit_msec > 0) {
-               cur_time = g_get_monotonic_time();
-               elapsed_time = cur_time - devc->start_time;
-
-               if (elapsed_time >= devc->limit_msec) {
-                       sr_info("Sampling time limit reached.");
-                       sdi->driver->dev_acquisition_stop(sdi, cb_data);
-                       devc->last_sample_fin = g_get_monotonic_time();
-                       return TRUE;
-               }
        }
 
        devc->last_sample_fin = g_get_monotonic_time();