X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-cli.c;h=df8236e9d1bd9a3c498cf4e4572dc5e9796504e4;hb=b1bb484525c606019ef14692f814563c2acd58b3;hp=981d6efeb92e790e53a553209a736cc9abf33fdd;hpb=894e20532ebaf07e22259d5bcec1b44239855698;p=sigrok-cli.git diff --git a/sigrok-cli.c b/sigrok-cli.c index 981d6ef..df8236e 100644 --- a/sigrok-cli.c +++ b/sigrok-cli.c @@ -629,7 +629,7 @@ static void datafeed_in(const struct sr_dev_inst *sdi, 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."); @@ -1290,7 +1290,7 @@ static int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args) 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; @@ -1313,7 +1313,7 @@ static int set_limit_time(const struct sr_dev_inst *sdi) } 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_config_set(sdi, SR_CONF_LIMIT_MSEC, &time_msec) != SR_OK) { g_critical("Failed to configure time limit."); sr_session_destroy(); return SR_ERR; @@ -1324,8 +1324,8 @@ static int set_limit_time(const struct sr_dev_inst *sdi) * 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; } @@ -1335,7 +1335,7 @@ static int set_limit_time(const struct sr_dev_inst *sdi) 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(); @@ -1420,7 +1420,7 @@ static void run_session(void) 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(); @@ -1430,7 +1430,7 @@ static void run_session(void) 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();