X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbaylibre-acme%2Fapi.c;h=cdf9968b20b94ad33217ebfa1c6f8ff93849d8be;hb=88a0265ebcb265ba839c02cc5bcd39e359c9f60f;hp=b4ef69ddf3c1372f84fe809295e2decb4bccccff;hpb=5fabeeac6af940b52f67ac8c925952accc9b39b3;p=libsigrok.git
diff --git a/src/hardware/baylibre-acme/api.c b/src/hardware/baylibre-acme/api.c
index b4ef69dd..cdf9968b 100644
--- a/src/hardware/baylibre-acme/api.c
+++ b/src/hardware/baylibre-acme/api.c
@@ -17,10 +17,12 @@
* along with this program. If not, see .
*/
+#include
#include "protocol.h"
+#include
+#include
SR_PRIV struct sr_dev_driver baylibre_acme_driver_info;
-static struct sr_dev_driver *di = &baylibre_acme_driver_info;
static const uint32_t devopts[] = {
SR_CONF_CONTINUOUS | SR_CONF_SET,
@@ -29,10 +31,19 @@ static const uint32_t devopts[] = {
SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
};
-static const uint32_t devopts_cg[] = {
- SR_CONF_PROBE_FACTOR | SR_CONF_GET | SR_CONF_SET,
- SR_CONF_POWER_OFF | SR_CONF_GET | SR_CONF_SET,
-};
+/*
+ * Currently there are two channel-group/probe options for ACME:
+ * - SR_CONF_PROBE_FACTOR - allows to modify current shunt resistance
+ * calibration
+ * - SR_CONF_POWER_OFF - allows to remotely cut-off/restore power to
+ * measured devices
+ *
+ * They are not static - we have to check each probe's capabilities in
+ * config_list().
+ */
+#define MAX_DEVOPTS_CG 2
+#define HAS_PROBE_FACTOR (SR_CONF_PROBE_FACTOR | SR_CONF_GET | SR_CONF_SET)
+#define HAS_POWER_OFF (SR_CONF_POWER_OFF | SR_CONF_GET | SR_CONF_SET)
#define MAX_SAMPLE_RATE 500 /* In Hz */
@@ -42,12 +53,12 @@ static const uint64_t samplerates[] = {
SR_HZ(1),
};
-static int init(struct sr_context *sr_ctx)
+static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
{
return std_init(sr_ctx, di, LOG_PREFIX);
}
-static GSList *scan(GSList *options)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
{
struct drv_context *drvc;
struct dev_context *devc;
@@ -58,7 +69,7 @@ static GSList *scan(GSList *options)
(void)options;
- drvc = di->priv;
+ drvc = di->context;
devices = NULL;
devc = g_malloc0(sizeof(struct dev_context));
@@ -116,7 +127,7 @@ static GSList *scan(GSList *options)
* Let's assume there's no ACME device present if no probe
* has been registered.
*/
- if (sdi->channel_groups == NULL)
+ if (!sdi->channel_groups)
goto err_out;
devices = g_slist_append(devices, sdi);
@@ -131,21 +142,15 @@ err_out:
return NULL;
}
-static GSList *dev_list(void)
+static GSList *dev_list(const struct sr_dev_driver *di)
{
- return ((struct drv_context *)(di->priv))->instances;
-}
-
-static int dev_clear(void)
-{
- 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;
@@ -155,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(void)
-{
- dev_clear();
-
- return SR_OK;
-}
-
static int config_get(uint32_t key, GVariant **data,
const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
@@ -229,12 +226,10 @@ static int config_set(uint32_t key, GVariant *data,
case SR_CONF_LIMIT_SAMPLES:
devc->limit_samples = g_variant_get_uint64(data);
devc->limit_msec = 0;
- sr_dbg("Setting sample limit to %" PRIu64, devc->limit_samples);
break;
case SR_CONF_LIMIT_MSEC:
devc->limit_msec = g_variant_get_uint64(data) * 1000;
devc->limit_samples = 0;
- sr_dbg("Setting time limit to %" PRIu64"ms", devc->limit_msec);
break;
case SR_CONF_SAMPLERATE:
samplerate = g_variant_get_uint64(data);
@@ -244,7 +239,7 @@ static int config_set(uint32_t key, GVariant *data,
break;
}
devc->samplerate = samplerate;
- sr_dbg("Setting samplerate to %" PRIu64, devc->samplerate);
+ bl_acme_maybe_set_update_interval(sdi, samplerate);
break;
case SR_CONF_PROBE_FACTOR:
if (!cg)
@@ -267,9 +262,10 @@ static int config_list(uint32_t key, GVariant **data,
const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
+ uint32_t devopts_cg[MAX_DEVOPTS_CG];
GVariant *gvar;
GVariantBuilder gvb;
- int ret;
+ int ret, num_devopts_cg = 0;
(void)sdi;
(void)cg;
@@ -295,8 +291,13 @@ static int config_list(uint32_t key, GVariant **data,
} else {
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
+ if (bl_acme_get_probe_type(cg) == PROBE_ENRG)
+ devopts_cg[num_devopts_cg++] = HAS_PROBE_FACTOR;
+ if (bl_acme_probe_has_pws(cg))
+ devopts_cg[num_devopts_cg++] = HAS_POWER_OFF;
+
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(uint32_t));
+ devopts_cg, num_devopts_cg, sizeof(uint32_t));
break;
default:
return SR_ERR_NA;
@@ -306,58 +307,100 @@ static int config_list(uint32_t key, GVariant **data,
return ret;
}
-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);
+ }
+}
+
+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 (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
+ 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();
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, LOG_PREFIX);
+
+ if (devc->samples_missed > 0)
+ sr_warn("%" PRIu64 " samples missed", devc->samples_missed);
return SR_OK;
}
@@ -367,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,
@@ -378,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,
};