baylibre-acme: Dynamically check per probe config options.

[libsigrok.git] / src / hardware / baylibre-acme / protocol.c

diff --git a/src/hardware/baylibre-acme/protocol.c b/src/hardware/baylibre-acme/protocol.c
index 461a7b5e4dc10392292a796bdacf9caf45f97a46..ca09eba069c51a0c017f851b53b31d5779346d58 100644 (file)
--- a/src/hardware/baylibre-acme/protocol.c
+++ b/src/hardware/baylibre-acme/protocol.c
@@ -245,6 +245,20 @@ SR_PRIV gboolean bl_acme_register_probe(struct sr_dev_inst *sdi, int type,
        return TRUE;
 }
 
+SR_PRIV int bl_acme_get_probe_type(const struct sr_channel_group *cg)
+{
+       struct channel_group_priv *cgp = cg->priv;
+
+       return cgp->probe_type;
+}
+
+SR_PRIV int bl_acme_probe_has_pws(const struct sr_channel_group *cg)
+{
+       struct channel_group_priv *cgp = cg->priv;
+
+       return sr_gpio_getval_export(pws_info_gpios[cgp->index]);
+}
+
 /*
  * Sets path to the hwmon attribute if this channel group
  * supports shunt resistance setting. The caller has to supply
@@ -328,11 +342,10 @@ SR_PRIV int bl_acme_set_shunt(const struct sr_channel_group *cg, uint64_t shunt)
        fd = g_fopen(path->str, "w");
        if (!fd) {
                sr_err("Error opening %s: %s", path->str, strerror(errno));
-               g_string_free(path, TRUE);
-               return SR_ERR_IO;
+               ret = SR_ERR_IO;
+               goto out;
        }
 
-       g_string_free(path, TRUE);
        g_fprintf(fd, "%" PRIu64 "\n", MOHM_TO_UOHM(shunt));
        fclose(fd);
 
@@ -349,8 +362,7 @@ SR_PRIV int bl_acme_read_power_state(const struct sr_channel_group *cg,
 
        cgp = cg->priv;
 
-       val = sr_gpio_getval_export(pws_info_gpios[cgp->index]);
-       if (val != 1) {
+       if (!bl_acme_probe_has_pws(cg)) {
                sr_err("Probe has no power-switch");
                return SR_ERR_ARG;
        }
@@ -369,8 +381,7 @@ SR_PRIV int bl_acme_set_power_off(const struct sr_channel_group *cg,
 
        cgp = cg->priv;
 
-       val = sr_gpio_getval_export(pws_info_gpios[cgp->index]);
-       if (val != 1) {
+       if (!bl_acme_probe_has_pws(cg)) {
                sr_err("Probe has no power-switch");
                return SR_ERR_ARG;
        }
@@ -503,7 +514,7 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
 
        packet.type = SR_DF_ANALOG;
        packet.payload = &analog;
-       memset(&analog, 0, sizeof(analog));
+       memset(&analog, 0, sizeof(struct sr_datafeed_analog));
        analog.data = &valf;
 
        /*