Consistently use 'devopts' variable across all drivers.

[libsigrok.git] / src / hardware / hameg-hmo / api.c

diff --git a/src/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c
index ff045f16425e61ad091be85868c2111845cb39fe..4ce1fd7fb64b3543e4150ab2fb160284ad75d131 100644 (file)
--- a/src/hardware/hameg-hmo/api.c
+++ b/src/hardware/hameg-hmo/api.c
@@ -29,7 +29,7 @@ static const char *manufacturers[] = {
        "HAMEG",
 };
 
-static const int32_t hwopts[] = {
+static const uint32_t scanopts[] = {
        SR_CONF_CONN,
        SR_CONF_SERIALCOMM,
 };
@@ -123,23 +123,12 @@ static GSList *dev_list(void)
 
 static void clear_helper(void *priv)
 {
-       unsigned int i;
        struct dev_context *devc;
-       struct scope_config *model;
 
        devc = priv;
-       model = devc->model_config;
 
        hmo_scope_state_free(devc->model_state);
 
-       for (i = 0; i < model->analog_channels; ++i)
-               g_slist_free(devc->analog_groups[i].channels);
-
-       for (i = 0; i < model->digital_pods; ++i) {
-               g_slist_free(devc->digital_groups[i].channels);
-               g_free(devc->digital_groups[i].name);
-       }
-
        g_free(devc->analog_groups);
        g_free(devc->digital_groups);
 
@@ -195,11 +184,11 @@ static int check_channel_group(struct dev_context *devc,
                return CG_NONE;
 
        for (i = 0; i < model->analog_channels; ++i)
-               if (cg == &devc->analog_groups[i])
+               if (cg == devc->analog_groups[i])
                        return CG_ANALOG;
 
        for (i = 0; i < model->digital_pods; ++i)
-               if (cg == &devc->digital_groups[i])
+               if (cg == devc->digital_groups[i])
                        return CG_DIGITAL;
 
        sr_err("Invalid channel group specified.");
@@ -207,7 +196,7 @@ static int check_channel_group(struct dev_context *devc,
        return CG_INVALID;
 }
 
-static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
+static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
                      const struct sr_channel_group *cg)
 {
        int ret, cg_type;
@@ -242,7 +231,7 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
                        return SR_ERR_CHANNEL_GROUP;
                } else if (cg_type == CG_ANALOG) {
                        for (i = 0; i < model->analog_channels; ++i) {
-                               if (cg != &devc->analog_groups[i])
+                               if (cg != devc->analog_groups[i])
                                        continue;
                                *data = g_variant_new_int32(model->num_ydivs);
                                ret = SR_OK;
@@ -259,7 +248,7 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
                        return SR_ERR_CHANNEL_GROUP;
                } else if (cg_type == CG_ANALOG) {
                        for (i = 0; i < model->analog_channels; ++i) {
-                               if (cg != &devc->analog_groups[i])
+                               if (cg != devc->analog_groups[i])
                                        continue;
                                *data = g_variant_new("(tt)",
                                                      (*model->vdivs)[state->analog_channels[i].vdiv][0],
@@ -290,7 +279,7 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
                        return SR_ERR_CHANNEL_GROUP;
                } else if (cg_type == CG_ANALOG) {
                        for (i = 0; i < model->analog_channels; ++i) {
-                               if (cg != &devc->analog_groups[i])
+                               if (cg != devc->analog_groups[i])
                                        continue;
                                *data = g_variant_new_string((*model->coupling_options)[state->analog_channels[i].coupling]);
                                ret = SR_OK;
@@ -331,7 +320,7 @@ static GVariant *build_tuples(const uint64_t (*array)[][2], unsigned int n)
        return g_variant_builder_end(&gvb);
 }
 
-static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
+static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
                      const struct sr_channel_group *cg)
 {
        int ret, cg_type;
@@ -389,7 +378,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
                            q != (*model->vdivs)[i][1])
                                continue;
                        for (j = 1; j <= model->analog_channels; ++j) {
-                               if (cg != &devc->analog_groups[j - 1])
+                               if (cg != devc->analog_groups[j - 1])
                                        continue;
                                state->analog_channels[j - 1].vdiv = i;
                                g_ascii_formatd(float_str, sizeof(float_str), "%E", (float) p / q);
@@ -471,7 +460,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
                        if (strcmp(tmp, (*model->coupling_options)[i]) != 0)
                                continue;
                        for (j = 1; j <= model->analog_channels; ++j) {
-                               if (cg != &devc->analog_groups[j - 1])
+                               if (cg != devc->analog_groups[j - 1])
                                        continue;
                                state->analog_channels[j-1].coupling = i;
 
@@ -503,7 +492,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
        return ret;
 }
 
-static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
+static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
                       const struct sr_channel_group *cg)
 {
        int cg_type;
@@ -519,18 +508,22 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
        model = devc->model_config;
 
        switch (key) {
+       case SR_CONF_SCAN_OPTIONS:
+               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+                               scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
+               break;
        case SR_CONF_DEVICE_OPTIONS:
                if (cg_type == CG_NONE) {
-                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
-                               model->hw_caps, model->num_hwcaps,
-                               sizeof(int32_t));
+                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+                               model->devopts, model->num_devopts,
+                               sizeof(uint32_t));
                } else if (cg_type == CG_ANALOG) {
-                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
-                               model->analog_hwcaps, model->num_analog_hwcaps,
-                               sizeof(int32_t));
+                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+                               model->analog_devopts, model->num_analog_devopts,
+                               sizeof(uint32_t));
                } else {
-                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
-                               NULL, 0, sizeof(int32_t));
+                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+                               NULL, 0, sizeof(uint32_t));
                }
                break;
        case SR_CONF_COUPLING:
@@ -723,6 +716,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        devc = sdi->priv;
        digital_added = FALSE;
 
+       g_slist_free(devc->enabled_channels);
+       devc->enabled_channels = NULL;
+
        for (l = sdi->channels; l; l = l->next) {
                ch = l->data;
                if (!ch->enabled)