tondaj-sl-814: properly set encoding digits

[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 f6ceaf5d208cc92f428e6135d7ae740adbbd3673..9d4f75076f75e05f83938c46acf6db99903cefd8 100644 (file)
--- a/src/hardware/baylibre-acme/protocol.c
+++ b/src/hardware/baylibre-acme/protocol.c
@@ -697,10 +697,12 @@ 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;
+       struct sr_datafeed_analog analog;
+       struct sr_analog_encoding encoding;
+       struct sr_analog_meaning meaning;
+       struct sr_analog_spec spec;
        struct sr_dev_inst *sdi;
        struct sr_channel *ch;
        struct channel_priv *chp;
@@ -719,9 +721,9 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
        if (!devc)
                return TRUE;
 
-       packet.type = SR_DF_ANALOG_OLD;
+       packet.type = SR_DF_ANALOG;
        packet.payload = &analog;
-       memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
+       sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
 
        if (read(devc->timer_fd, &nrexpiration, sizeof(nrexpiration)) < 0) {
                sr_warn("Failed to read timer information");
@@ -767,10 +769,10 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
                                continue;
                        chonly.next = NULL;
                        chonly.data = ch;
-                       analog.channels = &chonly;
                        analog.num_samples = 1;
-                       analog.mq = channel_to_mq(chl->data);
-                       analog.unit = channel_to_unit(ch);
+                       analog.meaning->channels = &chonly;
+                       analog.meaning->mq = channel_to_mq(chl->data);
+                       analog.meaning->unit = channel_to_unit(ch);
 
                        if (i < 1)
                                chp->val = read_sample(ch);
@@ -783,25 +785,12 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
                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.");
+       sr_sw_limits_update_samples_read(&devc->limits, 1);
+
+       if (sr_sw_limits_check(&devc->limits)) {
                sdi->driver->dev_acquisition_stop(sdi);
-               devc->last_sample_fin = g_get_monotonic_time();
                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);
-                       devc->last_sample_fin = g_get_monotonic_time();
-                       return TRUE;
-               }
        }
 
-       devc->last_sample_fin = g_get_monotonic_time();
        return TRUE;
 }