BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

baylibre-acme: correctly handle channel group options 

Split device options into general and channel group settings, and
adjust config_list() callback appropriately.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
This commit is contained in:
Bartosz Golaszewski 2015-02-27 16:48:17 +01:00 committed by Uwe Hermann
parent bf622e6d00
commit 5fabeeac6a
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/hardware/baylibre-acme/api.c
View File

@ -27,6 +27,9 @@ static const uint32_t devopts[] = {
SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
};
static const uint32_t devopts_cg[] = {
SR_CONF_PROBE_FACTOR | SR_CONF_GET | SR_CONF_SET, SR_CONF_PROBE_FACTOR | SR_CONF_GET | SR_CONF_SET,
SR_CONF_POWER_OFF | SR_CONF_GET | SR_CONF_SET, SR_CONF_POWER_OFF | SR_CONF_GET | SR_CONF_SET,
}; };
@ -272,20 +275,32 @@ static int config_list(uint32_t key, GVariant **data,
(void)cg; (void)cg;
ret = SR_OK; ret = SR_OK;
switch (key) { if (!cg) {
case SR_CONF_DEVICE_OPTIONS: switch (key) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, case SR_CONF_DEVICE_OPTIONS:
devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
break; devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
case SR_CONF_SAMPLERATE: break;
g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}")); case SR_CONF_SAMPLERATE:
gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
samplerates, ARRAY_SIZE(samplerates), sizeof(uint64_t)); gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"),
g_variant_builder_add(&gvb, "{sv}", "samplerate-steps", gvar); samplerates, ARRAY_SIZE(samplerates), sizeof(uint64_t));
*data = g_variant_builder_end(&gvb); g_variant_builder_add(&gvb, "{sv}",
break; "samplerate-steps", gvar);
default: *data = g_variant_builder_end(&gvb);
return SR_ERR_NA; break;
default:
return SR_ERR_NA;
}
} else {
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(uint32_t));
break;
default:
return SR_ERR_NA;
}
} }
return ret; return ret;