Remove unnecessary dev_clear() callbacks

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

diff --git a/src/hardware/baylibre-acme/api.c b/src/hardware/baylibre-acme/api.c
index 75f2c0446e4f76a94d95e5abe4809b93c7997214..cdf9968b20b94ad33217ebfa1c6f8ff93849d8be 100644 (file)
--- a/src/hardware/baylibre-acme/api.c
+++ b/src/hardware/baylibre-acme/api.c
@@ -17,7 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "protocol.h"
+#include <time.h>
+#include <sys/timerfd.h>
 
 SR_PRIV struct sr_dev_driver baylibre_acme_driver_info;
 
@@ -66,7 +69,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
        (void)options;
 
-       drvc = di->priv;
+       drvc = di->context;
        devices = NULL;
 
        devc = g_malloc0(sizeof(struct dev_context));
@@ -141,19 +144,13 @@ err_out:
 
 static GSList *dev_list(const struct sr_dev_driver *di)
 {
-       return ((struct drv_context *)(di->priv))->instances;
-}
-
-static int dev_clear(const struct sr_dev_driver *di)
-{
-       return std_dev_clear(di, NULL);
+       return ((struct drv_context *)(di->context))->instances;
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
 {
        (void)sdi;
 
-       /* Nothing to do here. */
        sdi->status = SR_ST_ACTIVE;
 
        return SR_OK;
@@ -163,19 +160,11 @@ static int dev_close(struct sr_dev_inst *sdi)
 {
        (void)sdi;
 
-       /* Nothing to do here. */
        sdi->status = SR_ST_INACTIVE;
 
        return SR_OK;
 }
 
-static int cleanup(const struct sr_dev_driver *di)
-{
-       dev_clear(di);
-
-       return SR_OK;
-}
-
 static int config_get(uint32_t key, GVariant **data,
                      const struct sr_dev_inst *sdi,
                      const struct sr_channel_group *cg)
@@ -346,11 +335,13 @@ static int dev_acquisition_open(const struct sr_dev_inst *sdi)
        return 0;
 }
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
-
-       (void)cb_data;
+       struct itimerspec tspec = {
+               .it_interval = { 0, 0 },
+               .it_value = { 0, 0 }
+       };
 
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
@@ -360,34 +351,41 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
        devc = sdi->priv;
        devc->samples_read = 0;
+       devc->samples_missed = 0;
+       devc->timer_fd = timerfd_create(CLOCK_MONOTONIC, 0);
+       if (devc->timer_fd < 0) {
+               sr_err("Error creating timer fd");
+               return SR_ERR;
+       }
 
-       if (pipe(devc->pipe_fds)) {
-               sr_err("Error setting up pipe");
+       tspec.it_interval.tv_sec = 0;
+       tspec.it_interval.tv_nsec = SR_HZ_TO_NS(devc->samplerate);
+       tspec.it_value = tspec.it_interval;
+
+       if (timerfd_settime(devc->timer_fd, 0, &tspec, NULL)) {
+               sr_err("Failed to set timer");
+               close(devc->timer_fd);
                return SR_ERR;
        }
 
-       devc->channel = g_io_channel_unix_new(devc->pipe_fds[0]);
+       devc->channel = g_io_channel_unix_new(devc->timer_fd);
        g_io_channel_set_flags(devc->channel, G_IO_FLAG_NONBLOCK, NULL);
        g_io_channel_set_encoding(devc->channel, NULL, NULL);
        g_io_channel_set_buffered(devc->channel, FALSE);
 
        sr_session_source_add_channel(sdi->session, devc->channel,
-               G_IO_IN | G_IO_ERR, 1, bl_acme_receive_data, (void *)sdi);
+               G_IO_IN | G_IO_ERR, 1000, bl_acme_receive_data, (void *)sdi);
 
-       /* Send header packet to the session bus. */
        std_session_send_df_header(sdi, LOG_PREFIX);
        devc->start_time = g_get_monotonic_time();
 
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-       struct sr_datafeed_packet packet;
        struct dev_context *devc;
 
-       (void)cb_data;
-
        devc = sdi->priv;
 
        if (sdi->status != SR_ST_ACTIVE)
@@ -399,9 +397,10 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
        g_io_channel_unref(devc->channel);
        devc->channel = NULL;
 
-       /* Send last packet. */
-       packet.type = SR_DF_END;
-       sr_session_send(sdi, &packet);
+       std_session_send_df_end(sdi, LOG_PREFIX);
+
+       if (devc->samples_missed > 0)
+               sr_warn("%" PRIu64 " samples missed", devc->samples_missed);
 
        return SR_OK;
 }
@@ -411,10 +410,9 @@ SR_PRIV struct sr_dev_driver baylibre_acme_driver_info = {
        .longname = "BayLibre ACME (Another Cute Measurement Equipment)",
        .api_version = 1,
        .init = init,
-       .cleanup = cleanup,
+       .cleanup = std_cleanup,
        .scan = scan,
        .dev_list = dev_list,
-       .dev_clear = dev_clear,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,
@@ -422,5 +420,5 @@ SR_PRIV struct sr_dev_driver baylibre_acme_driver_info = {
        .dev_close = dev_close,
        .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = dev_acquisition_stop,
-       .priv = NULL,
+       .context = NULL,
 };