X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbaylibre-acme%2Fapi.c;h=def373d1e2a34d4c682d14e6c4d286eba615aa26;hb=98fec29ecbb5093856b69311be8e937c162edded;hp=89d8b09e6d37e17319f2d6012f2bc532876f0ab9;hpb=6b80b80dcf2c6f6cdc4c8a782085846c861bd10d;p=libsigrok.git diff --git a/src/hardware/baylibre-acme/api.c b/src/hardware/baylibre-acme/api.c index 89d8b09e..def373d1 100644 --- a/src/hardware/baylibre-acme/api.c +++ b/src/hardware/baylibre-acme/api.c @@ -20,7 +20,6 @@ #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, @@ -29,7 +28,12 @@ static const uint32_t devopts[] = { SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, }; -#define MAX_SAMPLE_RATE 500 /* In Hz */ +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, +}; + +#define MAX_SAMPLE_RATE 500 /* In Hz */ static const uint64_t samplerates[] = { SR_HZ(1), @@ -37,12 +41,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; @@ -61,7 +65,8 @@ static GSList *scan(GSList *options) 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; @@ -80,39 +85,39 @@ static GSList *scan(GSList *options) * 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); @@ -125,12 +130,12 @@ 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) +static int dev_clear(const struct sr_dev_driver *di) { return std_dev_clear(di, NULL); } @@ -155,9 +160,9 @@ static int dev_close(struct sr_dev_inst *sdi) return SR_OK; } -static int cleanup(void) +static int cleanup(const struct sr_dev_driver *di) { - dev_clear(); + dev_clear(di); return SR_OK; } @@ -168,8 +173,8 @@ static int config_get(uint32_t key, GVariant **data, { struct dev_context *devc; int ret; - - (void)cg; + uint64_t shunt; + gboolean power_off; devc = sdi->priv; @@ -184,6 +189,20 @@ static int config_get(uint32_t key, GVariant **data, case SR_CONF_SAMPLERATE: *data = g_variant_new_uint64(devc->samplerate); break; + case SR_CONF_PROBE_FACTOR: + if (!cg) + return SR_ERR_CHANNEL_GROUP; + ret = bl_acme_get_shunt(cg, &shunt); + if (ret == SR_OK) + *data = g_variant_new_uint64(shunt); + break; + case SR_CONF_POWER_OFF: + if (!cg) + return SR_ERR_CHANNEL_GROUP; + ret = bl_acme_read_power_state(cg, &power_off); + if (ret == SR_OK) + *data = g_variant_new_boolean(power_off); + break; default: return SR_ERR_NA; } @@ -199,8 +218,6 @@ static int config_set(uint32_t key, GVariant *data, uint64_t samplerate; int ret; - (void)cg; - if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; @@ -211,13 +228,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); @@ -227,7 +241,16 @@ static int config_set(uint32_t key, GVariant *data, break; } devc->samplerate = samplerate; - sr_dbg("Setting samplerate to %" PRIu64, devc->samplerate); + break; + case SR_CONF_PROBE_FACTOR: + if (!cg) + return SR_ERR_CHANNEL_GROUP; + ret = bl_acme_set_shunt(cg, g_variant_get_uint64(data)); + break; + case SR_CONF_POWER_OFF: + if (!cg) + return SR_ERR_CHANNEL_GROUP; + ret = bl_acme_set_power_off(cg, g_variant_get_boolean(data)); break; default: ret = SR_ERR_NA; @@ -248,24 +271,32 @@ static int config_list(uint32_t key, GVariant **data, (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: + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(uint32_t)); + break; + default: + return SR_ERR_NA; + } } return ret; @@ -294,8 +325,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) 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);