X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fatten-pps3xxx%2Fapi.c;fp=src%2Fhardware%2Fatten-pps3xxx%2Fapi.c;h=f08671fb1081b28083601d0113c7afad8b4a0ccd;hb=758906aa711c2936e7e9adcb449f70905087a5d9;hp=b87d230df0684cf690e6467aa0e0d026b090e50e;hpb=50ccb36f201bd6b2326822f585c01498fe6fd86a;p=libsigrok.git diff --git a/src/hardware/atten-pps3xxx/api.c b/src/hardware/atten-pps3xxx/api.c index b87d230d..f08671fb 100644 --- a/src/hardware/atten-pps3xxx/api.c +++ b/src/hardware/atten-pps3xxx/api.c @@ -240,31 +240,27 @@ static int config_set(uint32_t key, GVariant *data, struct dev_context *devc; struct sr_channel *ch; gdouble dval; - int channel, ret, ival; + int channel, ival; gboolean bval; - ret = SR_OK; devc = sdi->priv; + if (!cg) { switch (key) { case SR_CONF_CHANNEL_CONFIG: if ((ival = std_str_idx(data, ARRAY_AND_SIZE(channel_modes))) < 0) return SR_ERR_ARG; - if (devc->model->channel_modes && (1 << ival) == 0) { - /* Not supported on this model. */ - ret = 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; @@ -280,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,