print_dev_line(sdi);
- if (sr_info_get(sdi->driver, SR_DI_TRIGGER_TYPES, (const void **)&charopts,
+ if (sr_config_list(sdi->driver, SR_CONF_TRIGGER_TYPE, (const void **)&charopts,
sdi) == SR_OK && charopts) {
printf("Supported triggers: ");
while (*charopts) {
printf("\n");
}
- if ((sr_info_get(sdi->driver, SR_DI_HWOPTS, (const void **)&hwopts,
+ if ((sr_config_list(sdi->driver, SR_CONF_SCAN_OPTIONS, (const void **)&hwopts,
NULL) == SR_OK) && hwopts) {
printf("Supported driver options:\n");
for (i = 0; hwopts[i]; i++) {
}
title = "Supported device options:\n";
- if ((sr_info_get(sdi->driver, SR_DI_HWCAPS, (const void **)&hwcaps,
+ if ((sr_config_list(sdi->driver, SR_CONF_DEVICE_OPTIONS, (const void **)&hwcaps,
NULL) != SR_OK) || !hwcaps)
/* Driver supports no device instance options. */
return;
if (srci->key == SR_CONF_PATTERN_MODE) {
/* Pattern generator modes */
printf(" %s", srci->id);
- if (sr_info_get(sdi->driver, SR_DI_PATTERNS,
+ if (sr_config_list(sdi->driver, SR_CONF_PATTERN_MODE,
(const void **)&stropts, sdi) == SR_OK) {
printf(" - supported patterns:\n");
for (i = 0; stropts[i]; i++)
} else if (srci->key == SR_CONF_BUFFERSIZE) {
/* Supported buffer sizes */
printf(" %s", srci->id);
- if (sr_info_get(sdi->driver, SR_DI_BUFFERSIZES,
+ if (sr_config_list(sdi->driver, SR_CONF_BUFFERSIZE,
(const void **)&integers, sdi) != SR_OK) {
printf("\n");
continue;
} else if (srci->key == SR_CONF_TIMEBASE) {
/* Supported time bases */
printf(" %s", srci->id);
- if (sr_info_get(sdi->driver, SR_DI_TIMEBASES,
+ if (sr_config_list(sdi->driver, SR_CONF_TIMEBASE,
(const void **)&rationals, sdi) != SR_OK) {
printf("\n");
continue;
} else if (srci->key == SR_CONF_TRIGGER_SOURCE) {
/* Supported trigger sources */
printf(" %s", srci->id);
- if (sr_info_get(sdi->driver, SR_DI_TRIGGER_SOURCES,
+ if (sr_config_list(sdi->driver, SR_CONF_TRIGGER_SOURCE,
(const void **)&stropts, sdi) != SR_OK) {
printf("\n");
continue;
} else if (srci->key == SR_CONF_FILTER) {
/* Supported filters */
printf(" %s", srci->id);
- if (sr_info_get(sdi->driver, SR_DI_FILTERS,
+ if (sr_config_list(sdi->driver, SR_CONF_FILTER,
(const void **)&stropts, sdi) != SR_OK) {
printf("\n");
continue;
} else if (srci->key == SR_CONF_VDIV) {
/* Supported volts/div values */
printf(" %s", srci->id);
- if (sr_info_get(sdi->driver, SR_DI_VDIVS,
+ if (sr_config_list(sdi->driver, SR_CONF_VDIV,
(const void **)&rationals, sdi) != SR_OK) {
printf("\n");
continue;
} else if (srci->key == SR_CONF_COUPLING) {
/* Supported coupling settings */
printf(" %s", srci->id);
- if (sr_info_get(sdi->driver, SR_DI_COUPLING,
+ if (sr_config_list(sdi->driver, SR_CONF_COUPLING,
(const void **)&stropts, sdi) != SR_OK) {
printf("\n");
continue;
unitsize = (logic_probelist->len + 7) / 8;
if (opt_pds && logic_probelist->len) {
- if (sr_info_get(sdi->driver, SR_CONF_SAMPLERATE,
+ if (sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
(const void **)&samplerate, sdi) != SR_OK) {
g_critical("Unable to initialize protocol "
"decoders: no samplerate found.");
ret = SR_ERR;
}
if (val)
- ret = sr_dev_config_set(sdi, srci->key, val);
+ ret = sr_config_set(sdi, srci->key, val);
if (ret != SR_OK) {
g_critical("Failed to set device option '%s'.", (char *)key);
return ret;
return SR_ERR;
}
- if (sr_driver_hwcap_exists(sdi->driver, SR_CONF_LIMIT_MSEC)) {
- if (sr_dev_config_set(sdi, SR_CONF_LIMIT_MSEC, &time_msec) != SR_OK) {
+ if (sr_dev_has_option(sdi, SR_CONF_LIMIT_MSEC)) {
+ if (sr_config_set(sdi, SR_CONF_LIMIT_MSEC, &time_msec) != SR_OK) {
g_critical("Failed to configure time limit.");
sr_session_destroy();
return SR_ERR;
* convert to samples based on the samplerate.
*/
limit_samples = 0;
- if (sr_dev_has_hwcap(sdi, SR_CONF_SAMPLERATE)) {
- sr_info_get(sdi->driver, SR_CONF_SAMPLERATE,
+ if (sr_dev_has_option(sdi, SR_CONF_SAMPLERATE)) {
+ sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
(const void **)&samplerate, sdi);
limit_samples = (*samplerate) * time_msec / (uint64_t)1000;
}
return SR_ERR;
}
- if (sr_dev_config_set(sdi, SR_CONF_LIMIT_SAMPLES,
+ if (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES,
&limit_samples) != SR_OK) {
g_critical("Failed to configure time-based sample limit.");
sr_session_destroy();
}
if (opt_continuous) {
- if (!sr_driver_hwcap_exists(sdi->driver, SR_CONF_CONTINUOUS)) {
+ if (!sr_dev_has_option(sdi, SR_CONF_CONTINUOUS)) {
g_critical("This device does not support continuous sampling.");
sr_session_destroy();
return;
if (opt_samples) {
if ((sr_parse_sizestring(opt_samples, &limit_samples) != SR_OK)
- || (sr_dev_config_set(sdi, SR_CONF_LIMIT_SAMPLES,
+ || (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES,
&limit_samples) != SR_OK)) {
g_critical("Failed to configure sample limit.");
sr_session_destroy();
if (opt_frames) {
if ((sr_parse_sizestring(opt_frames, &limit_frames) != SR_OK)
- || (sr_dev_config_set(sdi, SR_CONF_LIMIT_FRAMES,
+ || (sr_config_set(sdi, SR_CONF_LIMIT_FRAMES,
&limit_frames) != SR_OK)) {
g_critical("Failed to configure frame limit.");
sr_session_destroy();