Consistently use the "Sysclk" spelling everywhere.

[libsigrok.git] / src / hardware / atten-pps3xxx / api.c

diff --git a/src/hardware/atten-pps3xxx/api.c b/src/hardware/atten-pps3xxx/api.c
index 6079f9834f1c92d3b81b15d25b08829bc83e68dc..b82b9fb333cf9fd460764d638ce325f3e607caaf 100644 (file)
--- a/src/hardware/atten-pps3xxx/api.c
+++ b/src/hardware/atten-pps3xxx/api.c
@@ -234,56 +234,33 @@ static int config_get(uint32_t key, GVariant **data,
        return SR_OK;
 }
 
-static int find_str(const char *str, const char **strings, int array_size)
-{
-       int idx, i;
-
-       idx = -1;
-       for (i = 0; i < array_size; i++) {
-               if (!strcmp(str, strings[i])) {
-                       idx = i;
-                       break;
-               }
-       }
-
-       return idx;
-}
-
 static int config_set(uint32_t key, GVariant *data,
        const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
        struct sr_channel *ch;
        gdouble dval;
-       int channel, ret, ival;
-       const char *sval;
+       int channel, ival;
        gboolean bval;
 
-       ret = SR_OK;
        devc = sdi->priv;
+
        if (!cg) {
                switch (key) {
                case SR_CONF_CHANNEL_CONFIG:
-                       sval = g_variant_get_string(data, NULL);
-                       if ((ival = find_str(sval, ARRAY_AND_SIZE(channel_modes))) == -1) {
-                               ret = SR_ERR_ARG;
-                               break;
-                       }
-                       if (devc->model->channel_modes && (1 << ival) == 0) {
-                               /* Not supported on this model. */
-                               ret = SR_ERR_ARG;
-                       }
+                       if ((ival = std_str_idx(data, ARRAY_AND_SIZE(channel_modes))) < 0)
+                               return SR_ERR_ARG;
+                       if (devc->model->channel_modes && (1 << ival) == 0)
+                               return SR_ERR_ARG; /* Not supported on this model. */
                        if (ival == devc->channel_mode_set)
-                               /* Nothing to do. */
-                               break;
+                               break; /* Nothing to do. */
                        devc->channel_mode_set = ival;
                        devc->config_dirty = TRUE;
                        break;
                case SR_CONF_OVER_CURRENT_PROTECTION_ENABLED:
                        bval = g_variant_get_boolean(data);
                        if (bval == devc->over_current_protection_set)
-                               /* Nothing to do. */
-                               break;
+                               break; /* Nothing to do. */
                        devc->over_current_protection_set = bval;
                        devc->config_dirty = TRUE;
                        break;
@@ -299,31 +276,30 @@ static int config_set(uint32_t key, GVariant *data,
                case SR_CONF_VOLTAGE_TARGET:
                        dval = g_variant_get_double(data);
                        if (dval < 0 || dval > devc->model->channels[channel].voltage[1])
-                               ret = SR_ERR_ARG;
+                               return SR_ERR_ARG;
                        devc->config[channel].output_voltage_max = dval;
                        devc->config_dirty = TRUE;
                        break;
                case SR_CONF_CURRENT_LIMIT:
                        dval = g_variant_get_double(data);
                        if (dval < 0 || dval > devc->model->channels[channel].current[1])
-                               ret = SR_ERR_ARG;
+                               return SR_ERR_ARG;
                        devc->config[channel].output_current_max = dval;
                        devc->config_dirty = TRUE;
                        break;
                case SR_CONF_ENABLED:
                        bval = g_variant_get_boolean(data);
                        if (bval == devc->config[channel].output_enabled_set)
-                               /* Nothing to do. */
-                               break;
+                               break; /* Nothing to do. */
                        devc->config[channel].output_enabled_set = bval;
                        devc->config_dirty = TRUE;
                        break;
                default:
-                       ret = SR_ERR_NA;
+                       return SR_ERR_NA;
                }
        }
 
-       return ret;
+       return SR_OK;
 }
 
 static int config_list(uint32_t key, GVariant **data,
@@ -341,6 +317,8 @@ static int config_list(uint32_t key, GVariant **data,
                case SR_CONF_DEVICE_OPTIONS:
                        return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
                case SR_CONF_CHANNEL_CONFIG:
+                       if (!devc || !devc->model)
+                               return SR_ERR_ARG;
                        if (devc->model->channel_modes == CHANMODE_INDEPENDENT) {
                                /* The 1-channel models. */
                                *data = g_variant_new_strv(channel_modes, 1);
@@ -362,9 +340,13 @@ static int config_list(uint32_t key, GVariant **data,
                        *data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg));
                        break;
                case SR_CONF_VOLTAGE_TARGET:
+                       if (!devc || !devc->model)
+                               return SR_ERR_ARG;
                        *data = std_gvar_min_max_step_array(devc->model->channels[channel].voltage);
                        break;
                case SR_CONF_CURRENT_LIMIT:
+                       if (!devc || !devc->model)
+                               return SR_ERR_ARG;
                        *data = std_gvar_min_max_step_array(devc->model->channels[channel].current);
                        break;
                default: