return SR_OK;
}
-static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
- const struct sr_channel_group *cg)
+static int config_get(uint32_t key, GVariant **data,
+ const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
struct dev_context *devc;
- int ret;
(void)cg;
- ret = SR_OK;
devc = sdi->priv;
switch (key) {
return SR_ERR_NA;
}
- return ret;
+ return SR_OK;
}
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
- const struct sr_channel_group *cg)
+static int config_set(uint32_t key, GVariant *data,
+ const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
- uint64_t samplerate, limit_samples, capture_ratio;
- int ret;
+ struct dev_context *devc;
+ uint64_t samplerate, limit_samples;
(void)cg;
+ devc = sdi->priv;
+
switch (key) {
case SR_CONF_LIMIT_SAMPLES:
limit_samples = g_variant_get_uint64(data);
- ret = sl2_set_limit_samples(sdi, limit_samples);
- break;
+ return sl2_set_limit_samples(sdi, limit_samples);
case SR_CONF_SAMPLERATE:
samplerate = g_variant_get_uint64(data);
- ret = sl2_set_samplerate(sdi, samplerate);
- break;
+ return sl2_set_samplerate(sdi, samplerate);
case SR_CONF_CAPTURE_RATIO:
- capture_ratio = g_variant_get_uint64(data);
- ret = sl2_set_capture_ratio(sdi, capture_ratio);
+ devc->capture_ratio = g_variant_get_uint64(data);
break;
default:
return SR_ERR_NA;
}
- return ret;
+ return SR_OK;
}
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
- const struct sr_channel_group *cg)
+static int config_list(uint32_t key, GVariant **data,
+ const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
- GVariant *grange[2];
-
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
- return STD_CONFIG_LIST(key, data, sdi, cg, NULL, drvopts, devopts);
+ return STD_CONFIG_LIST(key, data, sdi, cg, NO_OPTS, drvopts, devopts);
case SR_CONF_SAMPLERATE:
*data = std_gvar_samplerates(ARRAY_AND_SIZE(sl2_samplerates));
break;
*data = std_gvar_array_i32(ARRAY_AND_SIZE(trigger_matches));
break;
case SR_CONF_LIMIT_SAMPLES:
- grange[0] = g_variant_new_uint64(0);
- grange[1] = g_variant_new_uint64(MAX_SAMPLES);
- *data = g_variant_new_tuple(grange, 2);
+ *data = std_gvar_tuple_u64(0, MAX_SAMPLES);
break;
default:
return SR_ERR_NA;