#include "protocol.h"
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,
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,
- SR_CONF_PROBE_FACTOR | SR_CONF_GET | SR_CONF_SET,
- SR_CONF_POWER_OFF | SR_CONF_GET | SR_CONF_SET,
};
-#define MAX_SAMPLE_RATE 500 /* In Hz */
+/*
+ * 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 */
static const uint64_t samplerates[] = {
SR_HZ(1),
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;
sdi = g_malloc0(sizeof(struct sr_dev_inst));
sdi->status = SR_ST_INACTIVE;
- sdi->model = g_strdup("Acme cape");
+ sdi->vendor = g_strdup("BayLibre");
+ sdi->model = g_strdup("ACME");
sdi->driver = di;
sdi->priv = devc;
* detect a temperature probe.
*/
status = bl_acme_detect_probe(bl_acme_get_enrg_addr(i),
- PROBE_NUM(i),
- ENRG_PROBE_NAME);
+ PROBE_NUM(i), ENRG_PROBE_NAME);
if (status) {
/* Energy probe detected. */
- status = bl_acme_register_probe(sdi,
- PROBE_ENRG,
- bl_acme_get_enrg_addr(i),
- PROBE_NUM(i));
+ status = bl_acme_register_probe(sdi, PROBE_ENRG,
+ bl_acme_get_enrg_addr(i), PROBE_NUM(i));
if (!status) {
sr_err("Error registering power probe %d",
PROBE_NUM(i));
continue;
}
-
} else if (i >= TEMP_PRB_START_INDEX) {
status = bl_acme_detect_probe(bl_acme_get_temp_addr(i),
- PROBE_NUM(i),
- TEMP_PROBE_NAME);
+ PROBE_NUM(i), TEMP_PROBE_NAME);
if (status) {
/* Temperature probe detected. */
status = bl_acme_register_probe(sdi,PROBE_TEMP,
- bl_acme_get_temp_addr(i),
- PROBE_NUM(i));
+ bl_acme_get_temp_addr(i), PROBE_NUM(i));
if (!status) {
sr_err("Error registering temp "
"probe %d", PROBE_NUM(i));
continue;
}
}
-
}
}
+ /*
+ * Let's assume there's no ACME device present if no probe
+ * has been registered.
+ */
+ if (!sdi->channel_groups)
+ goto err_out;
+
devices = g_slist_append(devices, sdi);
drvc->instances = g_slist_append(drvc->instances, sdi);
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)
+static int dev_clear(const struct sr_dev_driver *di)
{
return std_dev_clear(di, NULL);
}
return SR_OK;
}
-static int cleanup(void)
+static int cleanup(const struct sr_dev_driver *di)
{
- dev_clear();
+ dev_clear(di);
return SR_OK;
}
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);
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)
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;
ret = SR_OK;
- 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;
- case SR_CONF_SAMPLERATE:
- g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
- gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"),
- samplerates,
- ARRAY_SIZE(samplerates),
- sizeof(uint64_t));
- g_variant_builder_add(&gvb, "{sv}", "samplerate-steps", gvar);
- *data = g_variant_builder_end(&gvb);
- break;
- default:
- return SR_ERR_NA;
+ 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;
+ case SR_CONF_SAMPLERATE:
+ g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
+ gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"),
+ samplerates, ARRAY_SIZE(samplerates), sizeof(uint64_t));
+ g_variant_builder_add(&gvb, "{sv}",
+ "samplerate-steps", gvar);
+ *data = g_variant_builder_end(&gvb);
+ break;
+ default:
+ return SR_ERR_NA;
+ }
+ } 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, num_devopts_cg, sizeof(uint32_t));
+ break;
+ default:
+ return SR_ERR_NA;
+ }
}
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;
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;
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, 1, bl_acme_receive_data, (void *)sdi);
/* Send header packet to the session bus. */
std_session_send_df_header(sdi, LOG_PREFIX);
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);