hameg-hmo: fix several compiler warnings (assignments, memory)

[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 9cb4dc8efabda1939687a9114926e15c9764135c..ea2afef621867ed774703497f7588e961ee6b48e 100644 (file)
--- a/src/hardware/hameg-hmo/api.c
+++ b/src/hardware/hameg-hmo/api.c
@@ -130,7 +130,6 @@ static int dev_close(struct sr_dev_inst *sdi)
 static int check_channel_group(struct dev_context *devc,
                             const struct sr_channel_group *cg)
 {
-       unsigned int i;
        const struct scope_config *model;
 
        model = devc->model_config;
@@ -138,13 +137,11 @@ static int check_channel_group(struct dev_context *devc,
        if (!cg)
                return CG_NONE;
 
-       for (i = 0; i < model->analog_channels; i++)
-               if (cg == devc->analog_groups[i])
-                       return CG_ANALOG;
+       if (std_cg_idx(cg, devc->analog_groups, model->analog_channels) >= 0)
+               return CG_ANALOG;
 
-       for (i = 0; i < model->digital_pods; i++)
-               if (cg == devc->digital_groups[i])
-                       return CG_DIGITAL;
+       if (std_cg_idx(cg, devc->digital_groups, model->digital_pods) >= 0)
+               return CG_DIGITAL;
 
        sr_err("Invalid channel group specified.");
 
@@ -154,8 +151,7 @@ static int check_channel_group(struct dev_context *devc,
 static int config_get(uint32_t key, GVariant **data,
        const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
-       int cg_type;
-       unsigned int i;
+       int cg_type, idx;
        struct dev_context *devc;
        const struct scope_config *model;
        struct scope_state *state;
@@ -180,34 +176,24 @@ static int config_get(uint32_t key, GVariant **data,
                                      (*model->timebases)[state->timebase][1]);
                break;
        case SR_CONF_NUM_VDIV:
-               if (cg_type == CG_NONE) {
+               if (!cg)
                        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])
-                                       continue;
-                               *data = g_variant_new_int32(model->num_ydivs);
-                               break;
-                       }
-               } else {
+               if (cg_type != CG_ANALOG)
                        return SR_ERR_NA;
-               }
+               if (std_cg_idx(cg, devc->analog_groups, model->analog_channels) < 0)
+                       return SR_ERR_ARG;
+               *data = g_variant_new_int32(model->num_ydivs);
                break;
        case SR_CONF_VDIV:
-               if (cg_type == CG_NONE) {
+               if (!cg)
                        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])
-                                       continue;
-                               *data = g_variant_new("(tt)",
-                                                     (*model->vdivs)[state->analog_channels[i].vdiv][0],
-                                                     (*model->vdivs)[state->analog_channels[i].vdiv][1]);
-                               break;
-                       }
-               } else {
+               if (cg_type != CG_ANALOG)
                        return SR_ERR_NA;
-               }
+               if ((idx = std_cg_idx(cg, devc->analog_groups, model->analog_channels)) < 0)
+                       return SR_ERR_ARG;
+               *data = g_variant_new("(tt)",
+                                     (*model->vdivs)[state->analog_channels[idx].vdiv][0],
+                                     (*model->vdivs)[state->analog_channels[idx].vdiv][1]);
                break;
        case SR_CONF_TRIGGER_SOURCE:
                *data = g_variant_new_string((*model->trigger_sources)[state->trigger_source]);
@@ -219,18 +205,13 @@ static int config_get(uint32_t key, GVariant **data,
                *data = g_variant_new_double(state->horiz_triggerpos);
                break;
        case SR_CONF_COUPLING:
-               if (cg_type == CG_NONE) {
+               if (!cg)
                        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])
-                                       continue;
-                               *data = g_variant_new_string((*model->coupling_options)[state->analog_channels[i].coupling]);
-                               break;
-                       }
-               } else {
+               if (cg_type != CG_ANALOG)
                        return SR_ERR_NA;
-               }
+               if ((idx = std_cg_idx(cg, devc->analog_groups, model->analog_channels)) < 0)
+                       return SR_ERR_ARG;
+               *data = g_variant_new_string((*model->coupling_options)[state->analog_channels[idx].coupling]);
                break;
        case SR_CONF_SAMPLERATE:
                *data = g_variant_new_uint64(state->sample_rate);
@@ -245,8 +226,7 @@ static int config_get(uint32_t key, GVariant **data,
 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, idx;
-       unsigned int j;
+       int ret, cg_type, idx, j;
        char command[MAX_COMMAND_SIZE], float_str[30];
        struct dev_context *devc;
        const struct scope_config *model;
@@ -266,8 +246,6 @@ static int config_set(uint32_t key, GVariant *data,
        state = devc->model_state;
        update_sample_rate = FALSE;
 
-       ret = SR_ERR_NA;
-
        switch (key) {
        case SR_CONF_LIMIT_FRAMES:
                devc->frame_limit = g_variant_get_uint64(data);
@@ -283,24 +261,21 @@ static int config_set(uint32_t key, GVariant *data,
                ret = sr_scpi_send(sdi->conn, command);
                break;
        case SR_CONF_VDIV:
-               if (cg_type == CG_NONE)
+               if (!cg)
                        return SR_ERR_CHANNEL_GROUP;
                if ((idx = std_u64_tuple_idx(data, *model->vdivs, model->num_vdivs)) < 0)
                        return SR_ERR_ARG;
-               for (j = 0; j < model->analog_channels; j++) {
-                       if (cg != devc->analog_groups[j])
-                               continue;
-                       state->analog_channels[j].vdiv = idx;
-                       g_ascii_formatd(float_str, sizeof(float_str), "%E",
-                               (float) (*model->vdivs)[idx][0] / (*model->vdivs)[idx][1]);
-                       g_snprintf(command, sizeof(command),
-                                  (*model->scpi_dialect)[SCPI_CMD_SET_VERTICAL_DIV],
-                                  j + 1, float_str);
-                       if (sr_scpi_send(sdi->conn, command) != SR_OK ||
-                           sr_scpi_get_opc(sdi->conn) != SR_OK)
-                               return SR_ERR;
-                       break;
-               }
+               if ((j = std_cg_idx(cg, devc->analog_groups, model->analog_channels)) < 0)
+                       return SR_ERR_ARG;
+               state->analog_channels[j].vdiv = idx;
+               g_ascii_formatd(float_str, sizeof(float_str), "%E",
+                       (float) (*model->vdivs)[idx][0] / (*model->vdivs)[idx][1]);
+               g_snprintf(command, sizeof(command),
+                          (*model->scpi_dialect)[SCPI_CMD_SET_VERTICAL_DIV],
+                          j + 1, float_str);
+               if (sr_scpi_send(sdi->conn, command) != SR_OK ||
+                   sr_scpi_get_opc(sdi->conn) != SR_OK)
+                       return SR_ERR;
                ret = SR_OK;
                break;
        case SR_CONF_TIMEBASE:
@@ -340,22 +315,19 @@ static int config_set(uint32_t key, GVariant *data,
                ret = sr_scpi_send(sdi->conn, command);
                break;
        case SR_CONF_COUPLING:
-               if (cg_type == CG_NONE)
+               if (!cg)
                        return SR_ERR_CHANNEL_GROUP;
                if ((idx = std_str_idx(data, *model->coupling_options, model->num_coupling_options)) < 0)
                        return SR_ERR_ARG;
-               for (j = 0; j <= model->analog_channels; j++) {
-                       if (cg != devc->analog_groups[j])
-                               continue;
-                       state->analog_channels[j].coupling = idx;
-                       g_snprintf(command, sizeof(command),
-                                  (*model->scpi_dialect)[SCPI_CMD_SET_COUPLING],
-                                  j + 1, (*model->coupling_options)[idx]);
-                       if (sr_scpi_send(sdi->conn, command) != SR_OK ||
-                           sr_scpi_get_opc(sdi->conn) != SR_OK)
-                               return SR_ERR;
-                       break;
-               }
+               if ((j = std_cg_idx(cg, devc->analog_groups, model->analog_channels)) < 0)
+                       return SR_ERR_ARG;
+               state->analog_channels[j].coupling = idx;
+               g_snprintf(command, sizeof(command),
+                          (*model->scpi_dialect)[SCPI_CMD_SET_COUPLING],
+                          j + 1, (*model->coupling_options)[idx]);
+               if (sr_scpi_send(sdi->conn, command) != SR_OK ||
+                   sr_scpi_get_opc(sdi->conn) != SR_OK)
+                       return SR_ERR;
                ret = SR_OK;
                break;
        default:
@@ -392,7 +364,7 @@ static int config_list(uint32_t key, GVariant **data,
                *data = std_gvar_array_u32(ARRAY_AND_SIZE(scanopts));
                break;
        case SR_CONF_DEVICE_OPTIONS:
-               if (cg_type == CG_NONE) {
+               if (!cg) {
                        if (model)
                                *data = std_gvar_array_u32((const uint32_t *)model->devopts, model->num_devopts);
                        else
@@ -404,8 +376,10 @@ static int config_list(uint32_t key, GVariant **data,
                }
                break;
        case SR_CONF_COUPLING:
-               if (cg_type == CG_NONE)
+               if (!cg)
                        return SR_ERR_CHANNEL_GROUP;
+               if (!model)
+                       return SR_ERR_ARG;
                *data = g_variant_new_strv(*model->coupling_options, model->num_coupling_options);
                break;
        case SR_CONF_TRIGGER_SOURCE:
@@ -424,8 +398,10 @@ static int config_list(uint32_t key, GVariant **data,
                *data = std_gvar_tuple_array(*model->timebases, model->num_timebases);
                break;
        case SR_CONF_VDIV:
-               if (cg_type == CG_NONE)
+               if (!cg)
                        return SR_ERR_CHANNEL_GROUP;
+               if (!model)
+                       return SR_ERR_ARG;
                *data = std_gvar_tuple_array(*model->vdivs, model->num_vdivs);
                break;
        default:
@@ -578,6 +554,7 @@ static int hmo_setup_channels(const struct sr_dev_inst *sdi)
                        setup_changed = TRUE;
                        break;
                default:
+                       g_free(pod_enabled);
                        return SR_ERR;
                }
        }