X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fdreamsourcelab-dslogic%2Fapi.c;fp=src%2Fhardware%2Fdreamsourcelab-dslogic%2Fapi.c;h=4e0a1d10016eddff95be28ad75e3f12817dbe5cd;hb=758906aa711c2936e7e9adcb449f70905087a5d9;hp=83090f2d147a0823ac4520ad5d016a00a2fa66ca;hpb=50ccb36f201bd6b2326822f585c01498fe6fd86a;p=libsigrok.git diff --git a/src/hardware/dreamsourcelab-dslogic/api.c b/src/hardware/dreamsourcelab-dslogic/api.c index 83090f2d..4e0a1d10 100644 --- a/src/hardware/dreamsourcelab-dslogic/api.c +++ b/src/hardware/dreamsourcelab-dslogic/api.c @@ -443,7 +443,7 @@ 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; - int idx, ret; + int idx; gdouble low, high; (void)cg; @@ -453,8 +453,6 @@ static int config_set(uint32_t key, GVariant *data, devc = sdi->priv; - ret = SR_OK; - switch (key) { case SR_CONF_SAMPLERATE: if ((idx = std_u64_idx(data, devc->samplerates, devc->num_samplerates)) < 0) @@ -466,17 +464,16 @@ static int config_set(uint32_t key, GVariant *data, break; case SR_CONF_CAPTURE_RATIO: devc->capture_ratio = g_variant_get_uint64(data); - ret = (devc->capture_ratio > 100) ? SR_ERR : SR_OK; - break; + return (devc->capture_ratio > 100) ? SR_ERR : SR_OK; case SR_CONF_VOLTAGE_THRESHOLD: if (!strcmp(devc->profile->model, "DSLogic")) { if ((idx = std_double_tuple_idx(data, ARRAY_AND_SIZE(voltage_thresholds))) < 0) return SR_ERR_ARG; devc->cur_threshold = voltage_thresholds[idx][0]; - ret = dslogic_fpga_firmware_upload(sdi); + return dslogic_fpga_firmware_upload(sdi); } else { g_variant_get(data, "(dd)", &low, &high); - ret = dslogic_set_voltage_threshold(sdi, (low + high) / 2.0); + return dslogic_set_voltage_threshold(sdi, (low + high) / 2.0); } break; case SR_CONF_EXTERNAL_CLOCK: @@ -491,10 +488,10 @@ static int config_set(uint32_t key, GVariant *data, devc->clock_edge = idx; break; default: - ret = SR_ERR_NA; + return SR_ERR_NA; } - return ret; + return SR_OK; } static int config_list(uint32_t key, GVariant **data,