X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fbaylibre-acme%2Fapi.c;h=22a0c9b8b37d0035c88f244a3e6dbbebcb72e228;hb=05199c0ac9f15f229d43e50e86c4c1eadc55deac;hp=6827a16bfe5da763756f34318856411f0f220ee8;hpb=7c91c22a31a5017117116fa1fe6c2addbac813f1;p=libsigrok.git diff --git a/src/hardware/baylibre-acme/api.c b/src/hardware/baylibre-acme/api.c index 6827a16b..22a0c9b8 100644 --- a/src/hardware/baylibre-acme/api.c +++ b/src/hardware/baylibre-acme/api.c @@ -17,12 +17,17 @@ * along with this program. If not, see . */ +#include #include "protocol.h" +#include +#include -SR_PRIV struct sr_dev_driver baylibre_acme_driver_info; +static const uint32_t drvopts[] = { + SR_CONF_THERMOMETER, +}; static const uint32_t devopts[] = { - SR_CONF_CONTINUOUS | SR_CONF_SET, + SR_CONF_CONTINUOUS, SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, @@ -50,25 +55,15 @@ static const uint64_t samplerates[] = { SR_HZ(1), }; -static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx) -{ - return std_init(sr_ctx, di, LOG_PREFIX); -} - static GSList *scan(struct sr_dev_driver *di, GSList *options) { - struct drv_context *drvc; struct dev_context *devc; struct sr_dev_inst *sdi; - GSList *devices; gboolean status; int i; (void)options; - drvc = di->priv; - devices = NULL; - devc = g_malloc0(sizeof(struct dev_context)); devc->samplerate = SR_HZ(10); @@ -76,7 +71,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) sdi->status = SR_ST_INACTIVE; sdi->vendor = g_strdup("BayLibre"); sdi->model = g_strdup("ACME"); - sdi->driver = di; sdi->priv = devc; status = bl_acme_is_sane(); @@ -127,10 +121,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) if (!sdi->channel_groups) goto err_out; - devices = g_slist_append(devices, sdi); - drvc->instances = g_slist_append(drvc->instances, sdi); - - return devices; + return std_scan_complete(di, g_slist_append(NULL, sdi)); err_out: g_free(devc); @@ -139,43 +130,6 @@ err_out: return NULL; } -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); -} - -static int dev_open(struct sr_dev_inst *sdi) -{ - (void)sdi; - - /* Nothing to do here. */ - sdi->status = SR_ST_ACTIVE; - - return SR_OK; -} - -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) @@ -190,10 +144,8 @@ static int config_get(uint32_t key, GVariant **data, ret = SR_OK; switch (key) { case SR_CONF_LIMIT_SAMPLES: - *data = g_variant_new_uint64(devc->limit_samples); - break; case SR_CONF_LIMIT_MSEC: - *data = g_variant_new_uint64(devc->limit_msec); + ret = sr_sw_limits_config_get(&devc->limits, key, data); break; case SR_CONF_SAMPLERATE: *data = g_variant_new_uint64(devc->samplerate); @@ -227,20 +179,13 @@ static int config_set(uint32_t key, GVariant *data, uint64_t samplerate; int ret; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - devc = sdi->priv; ret = SR_OK; switch (key) { case SR_CONF_LIMIT_SAMPLES: - devc->limit_samples = g_variant_get_uint64(data); - devc->limit_msec = 0; - break; case SR_CONF_LIMIT_MSEC: - devc->limit_msec = g_variant_get_uint64(data) * 1000; - devc->limit_samples = 0; + ret = sr_sw_limits_config_set(&devc->limits, key, data); break; case SR_CONF_SAMPLERATE: samplerate = g_variant_get_uint64(data); @@ -276,18 +221,12 @@ static int config_list(uint32_t key, GVariant **data, uint32_t devopts_cg[MAX_DEVOPTS_CG]; GVariant *gvar; GVariantBuilder gvb; - int ret, num_devopts_cg = 0; + int num_devopts_cg = 0; - (void)sdi; - (void)cg; - - ret = SR_OK; if (!cg) { switch (key) { case SR_CONF_DEVICE_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); - break; + return STD_CONFIG_LIST(key, data, sdi, cg, NULL, drvopts, devopts); case SR_CONF_SAMPLERATE: g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}")); gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), @@ -315,80 +254,116 @@ static int config_list(uint32_t key, GVariant **data, } } - return ret; + return SR_OK; } -static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) +static void dev_acquisition_close(const struct sr_dev_inst *sdi) { - struct dev_context *devc; + GSList *chl; + struct sr_channel *ch; - (void)cb_data; + for (chl = sdi->channels; chl; chl = chl->next) { + ch = chl->data; + bl_acme_close_channel(ch); + } +} - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; +static int dev_acquisition_open(const struct sr_dev_inst *sdi) +{ + GSList *chl; + struct sr_channel *ch; + + for (chl = sdi->channels; chl; chl = chl->next) { + ch = chl->data; + if (bl_acme_open_channel(ch)) { + sr_err("Error opening channel %s", ch->name); + dev_acquisition_close(sdi); + return SR_ERR; + } + } + + return 0; +} + +static int dev_acquisition_start(const struct sr_dev_inst *sdi) +{ + struct dev_context *devc; + struct itimerspec tspec = { + .it_interval = { 0, 0 }, + .it_value = { 0, 0 } + }; + + if (dev_acquisition_open(sdi)) + return SR_ERR; 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; + } + + tspec.it_interval.tv_sec = 0; + tspec.it_interval.tv_nsec = SR_HZ_TO_NS(devc->samplerate); + tspec.it_value = tspec.it_interval; - if (pipe(devc->pipe_fds)) { - sr_err("Error setting up pipe"); + 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(); + std_session_send_df_header(sdi); + sr_sw_limits_acquisition_start(&devc->limits); 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) - 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); devc->channel = NULL; - /* Send last packet. */ - packet.type = SR_DF_END; - sr_session_send(sdi, &packet); + std_session_send_df_end(sdi); + + if (devc->samples_missed > 0) + sr_warn("%" PRIu64 " samples missed", devc->samples_missed); return SR_OK; } -SR_PRIV struct sr_dev_driver baylibre_acme_driver_info = { +static struct sr_dev_driver baylibre_acme_driver_info = { .name = "baylibre-acme", .longname = "BayLibre ACME (Another Cute Measurement Equipment)", .api_version = 1, - .init = init, - .cleanup = cleanup, + .init = std_init, + .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, - .dev_clear = dev_clear, + .dev_list = std_dev_list, + .dev_clear = std_dev_clear, .config_get = config_get, .config_set = config_set, .config_list = config_list, - .dev_open = dev_open, - .dev_close = dev_close, + .dev_open = std_dummy_dev_open, + .dev_close = std_dummy_dev_close, .dev_acquisition_start = dev_acquisition_start, .dev_acquisition_stop = dev_acquisition_stop, - .priv = NULL, + .context = NULL, }; +SR_REGISTER_DEV_DRIVER(baylibre_acme_driver_info);