s = g_string_sized_new(128);
g_string_assign(s, driver->name);
- if (sr_config_get(driver, sdi, NULL, SR_CONF_CONN, &gvar) == SR_OK) {
+ if (maybe_config_get(driver, sdi, NULL, SR_CONF_CONN, &gvar) == SR_OK) {
g_string_append(s, ":conn=");
g_string_append(s, g_variant_get_string(gvar, NULL));
g_variant_unref(gvar);
const uint32_t *opts;
gsize num_elements, i;
- if ((sr_config_list(driver, NULL, NULL, SR_CONF_DEVICE_OPTIONS,
- &gvar_opts) == SR_OK)) {
+ if (sr_config_list(driver, NULL, NULL, SR_CONF_DEVICE_OPTIONS,
+ &gvar_opts) == SR_OK) {
opts = g_variant_get_fixed_array(gvar_opts, &num_elements,
sizeof(uint32_t));
if (num_elements) {
g_variant_unref(gvar_opts);
}
- if ((sr_config_list(driver, NULL, NULL, SR_CONF_SCAN_OPTIONS,
- &gvar_opts) == SR_OK)) {
+ if (sr_config_list(driver, NULL, NULL, SR_CONF_SCAN_OPTIONS,
+ &gvar_opts) == SR_OK) {
opts = g_variant_get_fixed_array(gvar_opts, &num_elements,
sizeof(uint32_t));
if (num_elements) {
select_channels(sdi);
channel_group = select_channel_group(sdi);
- if ((sr_config_list(driver, sdi, channel_group, SR_CONF_DEVICE_OPTIONS,
- &gvar_opts)) != SR_OK)
+ if (sr_config_list(driver, sdi, channel_group, SR_CONF_DEVICE_OPTIONS,
+ &gvar_opts) != SR_OK)
/* Driver supports no device instance options. */
return;
continue;
if (key == SR_CONF_TRIGGER_MATCH) {
- if (sr_config_list(driver, sdi, channel_group, key,
+ if (maybe_config_list(driver, sdi, channel_group, key,
&gvar_list) != SR_OK) {
printf("\n");
continue;
printf("\n");
g_variant_unref(gvar_list);
- } else if (key == SR_CONF_LIMIT_SAMPLES) {
+ } else if (key == SR_CONF_LIMIT_SAMPLES
+ && config_key_has_cap(driver, sdi, cg, key, SR_CONF_LIST)) {
/* If implemented in config_list(), this denotes the
* maximum number of samples a device can send. This
* really applies only to logic analyzers, and then
* have it turned off by default. The values returned
* are the low/high limits. */
if (sr_config_list(driver, sdi, channel_group, key,
- &gvar) != SR_OK) {
- continue;
+ &gvar) == SR_OK) {
+ g_variant_get(gvar, "(tt)", &low, &high);
+ g_variant_unref(gvar);
+ printf(" Maximum number of samples: %"PRIu64"\n", high);
}
- g_variant_get(gvar, "(tt)", &low, &high);
- g_variant_unref(gvar);
- printf(" Maximum number of samples: %"PRIu64"\n", high);
} else if (key == SR_CONF_SAMPLERATE) {
/* Supported samplerates */
printf(" %s", srci->id);
- if (sr_config_list(driver, sdi, channel_group, SR_CONF_SAMPLERATE,
+ if (maybe_config_list(driver, sdi, channel_group, SR_CONF_SAMPLERATE,
&gvar_dict) != SR_OK) {
printf("\n");
continue;
g_variant_unref(gvar_dict);
} else if (srci->datatype == SR_T_UINT64) {
- printf(" %s", srci->id);
+ printf(" %s: ", srci->id);
gvar = NULL;
- if (sr_config_get(driver, sdi, channel_group, key,
+ if (maybe_config_get(driver, sdi, channel_group, key,
&gvar) == SR_OK) {
tmp_uint64 = g_variant_get_uint64(gvar);
g_variant_unref(gvar);
} else
tmp_uint64 = 0;
- if (sr_config_list(driver, sdi, channel_group,
- SR_CONF_BUFFERSIZE, &gvar_list) != SR_OK) {
+ if (maybe_config_list(driver, sdi, channel_group,
+ key, &gvar_list) != SR_OK) {
if (gvar) {
/* Can't list it, but we have a value to show. */
printf("%"PRIu64" (current)", tmp_uint64);
} else if (srci->datatype == SR_T_STRING) {
printf(" %s: ", srci->id);
- if (sr_config_get(driver, sdi, channel_group, key,
+ if (maybe_config_get(driver, sdi, channel_group, key,
&gvar) == SR_OK) {
tmp_str = g_strdup(g_variant_get_string(gvar, NULL));
g_variant_unref(gvar);
} else
tmp_str = NULL;
- if (sr_config_list(driver, sdi, channel_group, key,
+ if (maybe_config_list(driver, sdi, channel_group, key,
&gvar) != SR_OK) {
if (tmp_str) {
/* Can't list it, but we have a value to show. */
} else if (srci->datatype == SR_T_UINT64_RANGE) {
printf(" %s: ", srci->id);
- if (sr_config_list(driver, sdi, channel_group, key,
+ if (maybe_config_list(driver, sdi, channel_group, key,
&gvar_list) != SR_OK) {
printf("\n");
continue;
}
- if (sr_config_get(driver, sdi, channel_group, key, &gvar) == SR_OK) {
+ if (maybe_config_get(driver, sdi, channel_group, key, &gvar) == SR_OK) {
g_variant_get(gvar, "(tt)", &cur_low, &cur_high);
g_variant_unref(gvar);
} else {
} else if (srci->datatype == SR_T_BOOL) {
printf(" %s: ", srci->id);
- if (sr_config_get(driver, sdi, channel_group, key,
+ if (maybe_config_get(driver, sdi, channel_group, key,
&gvar) == SR_OK) {
if (g_variant_get_boolean(gvar))
printf("on (current), off\n");
} else if (srci->datatype == SR_T_DOUBLE_RANGE) {
printf(" %s: ", srci->id);
- if (sr_config_list(driver, sdi, channel_group, key,
+ if (maybe_config_list(driver, sdi, channel_group, key,
&gvar_list) != SR_OK) {
printf("\n");
continue;
}
- if (sr_config_get(driver, sdi, channel_group, key, &gvar) == SR_OK) {
+ if (maybe_config_get(driver, sdi, channel_group, key, &gvar) == SR_OK) {
g_variant_get(gvar, "(dd)", &dcur_low, &dcur_high);
g_variant_unref(gvar);
} else {
} else if (srci->datatype == SR_T_FLOAT) {
printf(" %s: ", srci->id);
- if (sr_config_get(driver, sdi, channel_group, key,
+ if (maybe_config_get(driver, sdi, channel_group, key,
&gvar) == SR_OK) {
printf("%f\n", g_variant_get_double(gvar));
g_variant_unref(gvar);
} else if (srci->datatype == SR_T_RATIONAL_PERIOD
|| srci->datatype == SR_T_RATIONAL_VOLT) {
printf(" %s", srci->id);
- if (sr_config_get(driver, sdi, channel_group, key,
+ if (maybe_config_get(driver, sdi, channel_group, key,
&gvar) == SR_OK) {
g_variant_get(gvar, "(tt)", &cur_p, &cur_q);
g_variant_unref(gvar);
} else
cur_p = cur_q = 0;
- if (sr_config_list(driver, sdi, channel_group,
+ if (maybe_config_list(driver, sdi, channel_group,
key, &gvar_list) != SR_OK) {
printf("\n");
continue;