ret = SR_ERR;
}
if (val)
- ret = sdi->driver->dev_config_set(sdi, hwo->hwcap, val);
+ ret = sr_dev_config_set(sdi, hwo->hwcap, val);
if (ret != SR_OK) {
g_critical("Failed to set device option '%s'.", (char *)key);
return ret;
}
if (sr_driver_hwcap_exists(sdi->driver, SR_HWCAP_LIMIT_MSEC)) {
- if (sdi->driver->dev_config_set(sdi,
- SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) {
+ if (sr_dev_config_set(sdi, SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) {
g_critical("Failed to configure time limit.");
sr_session_destroy();
return SR_ERR;
return SR_ERR;
}
- if (sdi->driver->dev_config_set(sdi,
- SR_HWCAP_LIMIT_SAMPLES, &limit_samples) != SR_OK) {
+ if (sr_dev_config_set(sdi, SR_HWCAP_LIMIT_SAMPLES,
+ &limit_samples) != SR_OK) {
g_critical("Failed to configure time-based sample limit.");
sr_session_destroy();
return SR_ERR;
sr_session_new();
sr_session_datafeed_callback_add(datafeed_in);
+ if (sr_session_dev_add(sdi) != SR_OK) {
+ g_critical("Failed to use device.");
+ sr_session_destroy();
+ return;
+ }
+
if (opt_dev) {
if ((devargs = parse_generic_arg(opt_dev, FALSE))) {
if (set_dev_options(sdi, devargs) != SR_OK)
}
}
- if (sr_session_dev_add(sdi) != SR_OK) {
- g_critical("Failed to use device.");
- sr_session_destroy();
- return;
- }
-
if (select_probes(sdi) != SR_OK) {
g_critical("Failed to set probes.");
sr_session_destroy();
g_free(triggerlist);
}
- if (sdi->driver->dev_config_set(sdi, SR_HWCAP_PROBECONFIG,
- (char *)sdi->probes) != SR_OK) {
- g_critical("Failed to configure probes.");
- sr_session_destroy();
- return;
- }
-
if (opt_continuous) {
if (!sr_driver_hwcap_exists(sdi->driver, SR_HWCAP_CONTINUOUS)) {
g_critical("This device does not support continuous sampling.");
if (opt_samples) {
if ((sr_parse_sizestring(opt_samples, &limit_samples) != SR_OK)
- || (sdi->driver->dev_config_set(sdi, SR_HWCAP_LIMIT_SAMPLES,
+ || (sr_dev_config_set(sdi, SR_HWCAP_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)
- || (sdi->driver->dev_config_set(sdi,
- SR_HWCAP_LIMIT_FRAMES, &limit_frames) != SR_OK)) {
+ || (sr_dev_config_set(sdi, SR_HWCAP_LIMIT_FRAMES,
+ &limit_frames) != SR_OK)) {
g_critical("Failed to configure frame limit.");
sr_session_destroy();
return;