Revert "baylibre-acme: Fix a compiler warning."

[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 8769eefe7e662a259f9096fe093a6a71715f4d15..d0552553feffbebdb298cba9c1c848e0d87de1e8 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
@@ -281,6 +295,43 @@ static int get_shunt_path(const struct sr_channel_group *cg, GString *path)
        return ret;
 }
 
+/*
+ * Try setting the update_interval sysfs attribute for each probe according
+ * to samplerate.
+ */
+SR_PRIV void bl_acme_maybe_set_update_interval(const struct sr_dev_inst *sdi,
+                                              uint64_t samplerate)
+{
+       struct sr_channel_group *cg;
+       struct channel_group_priv *cgp;
+       GString *hwmon;
+       GSList *l;
+       FILE *fd;
+
+       for (l = sdi->channel_groups; l != NULL; l = l->next) {
+               cg = l->data;
+               cgp = cg->priv;
+
+               hwmon = g_string_sized_new(64);
+               g_string_append_printf(hwmon,
+                               "/sys/class/hwmon/hwmon%d/update_interval",
+                               cgp->hwmon_num);
+
+               if (g_file_test(hwmon->str, G_FILE_TEST_EXISTS)) {
+                       fd = g_fopen(hwmon->str, "w");
+                       if (!fd) {
+                               g_string_free(hwmon, TRUE);
+                               continue;
+                       }
+
+                       g_fprintf(fd, "%" PRIu64 "\n", 1000 / samplerate);
+                       fclose(fd);
+               }
+
+               g_string_free(hwmon, TRUE);
+       }
+}
+
 SR_PRIV int bl_acme_get_shunt(const struct sr_channel_group *cg,
                              uint64_t *shunt)
 {
@@ -348,8 +399,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;
        }
@@ -368,8 +418,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;
        }
@@ -502,7 +551,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;
 
        /*