X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fbaylibre-acme%2Fapi.c;h=c116cbbb6ef10ec1f105a33f3f77753aa63b6ffa;hb=d01c4c56d57491edb1d430646e88cf5341d878e6;hp=c91a9063fdfe949091b5f5a1ce546076f7512eb5;hpb=4e88b86cc81ce6569c4bbf947fc2f0f47f4ce8a1;p=libsigrok.git
diff --git a/src/hardware/baylibre-acme/api.c b/src/hardware/baylibre-acme/api.c
index c91a9063..c116cbbb 100644
--- 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 .
*/
+#include
#include "protocol.h"
+#include
+#include
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,7 +144,7 @@ err_out:
static GSList *dev_list(const struct sr_dev_driver *di)
{
- return ((struct drv_context *)(di->priv))->instances;
+ return ((struct drv_context *)(di->context))->instances;
}
static int dev_clear(const struct sr_dev_driver *di)
@@ -349,6 +352,10 @@ static int dev_acquisition_open(const struct sr_dev_inst *sdi)
static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
{
struct dev_context *devc;
+ struct itimerspec tspec = {
+ .it_interval = { 0, 0 },
+ .it_value = { 0, 0 }
+ };
(void)cb_data;
@@ -360,19 +367,30 @@ 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);
@@ -393,6 +411,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
+ dev_acquisition_close(sdi);
sr_session_source_remove_channel(sdi->session, devc->channel);
g_io_channel_shutdown(devc->channel, FALSE, NULL);
g_io_channel_unref(devc->channel);
@@ -402,6 +421,9 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
packet.type = SR_DF_END;
sr_session_send(sdi, &packet);
+ if (devc->samples_missed > 0)
+ sr_warn("%" PRIu64 " samples missed", devc->samples_missed);
+
return SR_OK;
}
@@ -421,5 +443,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,
};