X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbaylibre-acme%2Fapi.c;h=b1884b62b15aa0bbef0d2ab6697abb4286291292;hb=41812aca436805b0614f2a8f31cf2f8ce494aea0;hp=def373d1e2a34d4c682d14e6c4d286eba615aa26;hpb=98fec29ecbb5093856b69311be8e937c162edded;p=libsigrok.git

diff --git a/src/hardware/baylibre-acme/api.c b/src/hardware/baylibre-acme/api.c
index def373d1..b1884b62 100644
--- a/src/hardware/baylibre-acme/api.c
+++ b/src/hardware/baylibre-acme/api.c
@@ -18,6 +18,8 @@
  */
 
 #include "protocol.h"
+#include <time.h>
+#include <sys/timerfd.h>
 
 SR_PRIV struct sr_dev_driver baylibre_acme_driver_info;
 
@@ -28,10 +30,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 */
 
@@ -57,7 +68,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));
@@ -132,7 +143,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)
@@ -241,6 +252,7 @@ static int config_set(uint32_t key, GVariant *data,
 			break;
 		}
 		devc->samplerate = samplerate;
+		bl_acme_maybe_set_update_interval(sdi, samplerate);
 		break;
 	case SR_CONF_PROBE_FACTOR:
 		if (!cg)
@@ -263,9 +275,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;
@@ -291,8 +304,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;
@@ -302,30 +320,76 @@ static int config_list(uint32_t key, GVariant **data,
 	return ret;
 }
 
+static void dev_acquisition_close(const struct sr_dev_inst *sdi)
+{
+	GSList *chl;
+	struct sr_channel *ch;
+
+	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, void *cb_data)
 {
 	struct dev_context *devc;
+	struct itimerspec tspec = {
+		.it_interval = { 0, 0 },
+		.it_value = { 0, 0 }
+	};
 
 	(void)cb_data;
 
 	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;
+	}
 
-	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);
@@ -346,6 +410,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);
@@ -355,6 +420,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("%d samples missed", devc->samples_missed);
+
 	return SR_OK;
 }
 
@@ -374,5 +442,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,
 };