opts = NULL;
for (gl = keys; gl; gl = gl->next) {
key = gl->data;
- if (!(srci = sr_drvopt_name_get(key))) {
+ if (!(srci = sr_config_info_name_get(key))) {
g_critical("Unknown option %s", key);
return NULL;
}
NULL) == SR_OK) && hwopts) {
printf("Supported driver options:\n");
for (i = 0; hwopts[i]; i++) {
- if (!(srci = sr_drvopt_get(hwopts[i])))
+ if (!(srci = sr_config_info_get(hwopts[i])))
continue;
printf(" %s\n", srci->id);
}
return;
for (cap = 0; hwcaps[cap]; cap++) {
- if (!(srci = sr_devopt_get(hwcaps[cap])))
+ if (!(srci = sr_config_info_get(hwcaps[cap])))
continue;
if (title) {
title = NULL;
}
- if (srci->key == SR_HWCAP_PATTERN_MODE) {
+ 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++)
printf("\n");
}
- } else if (srci->key == SR_HWCAP_SAMPLERATE) {
+ } else if (srci->key == SR_CONF_SAMPLERATE) {
/* Supported samplerates */
printf(" %s", srci->id);
- if (sr_info_get(sdi->driver, SR_DI_SAMPLERATES,
+ if (sr_config_list(sdi->driver, SR_CONF_SAMPLERATE,
(const void **)&samplerates, sdi) != SR_OK) {
printf("\n");
continue;
printf(" %s\n", sr_samplerate_string(samplerates->list[i]));
}
- } else if (srci->key == SR_HWCAP_BUFFERSIZE) {
+ } else if (srci->key == SR_CONF_BUFFERSIZE) {
/* Supported buffer sizes */
printf(" %s", srci->id);
if (sr_info_get(sdi->driver, SR_DI_BUFFERSIZES,
for (i = 0; integers[i]; i++)
printf(" %"PRIu64"\n", integers[i]);
- } else if (srci->key == SR_HWCAP_TIMEBASE) {
+ } else if (srci->key == SR_CONF_TIMEBASE) {
/* Supported time bases */
printf(" %s", srci->id);
if (sr_info_get(sdi->driver, SR_DI_TIMEBASES,
printf(" %s\n", sr_period_string(
rationals[i].p * rationals[i].q));
- } else if (srci->key == SR_HWCAP_TRIGGER_SOURCE) {
+ } 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,
for (i = 0; stropts[i]; i++)
printf(" %s\n", stropts[i]);
- } else if (srci->key == SR_HWCAP_FILTER) {
+ } else if (srci->key == SR_CONF_FILTER) {
/* Supported filters */
printf(" %s", srci->id);
if (sr_info_get(sdi->driver, SR_DI_FILTERS,
for (i = 0; stropts[i]; i++)
printf(" %s\n", stropts[i]);
- } else if (srci->key == SR_HWCAP_VDIV) {
+ } else if (srci->key == SR_CONF_VDIV) {
/* Supported volts/div values */
printf(" %s", srci->id);
if (sr_info_get(sdi->driver, SR_DI_VDIVS,
for (i = 0; rationals[i].p && rationals[i].q; i++)
printf(" %s\n", sr_voltage_string( &rationals[i]));
- } else if (srci->key == SR_HWCAP_COUPLING) {
+ } else if (srci->key == SR_CONF_COUPLING) {
/* Supported coupling settings */
printf(" %s", srci->id);
if (sr_info_get(sdi->driver, SR_DI_COUPLING,
static void datafeed_in(const struct sr_dev_inst *sdi,
const struct sr_datafeed_packet *packet)
{
+ const struct sr_datafeed_meta *meta;
const struct sr_datafeed_logic *logic;
const struct sr_datafeed_analog *analog;
+ struct sr_config *src;
static struct sr_output *o = NULL;
static GArray *logic_probelist = NULL;
static uint64_t received_samples = 0;
uint64_t *samplerate, output_len, filter_out_len;
uint8_t *output_buf, *filter_out;
GString *out;
+ GSList *l;
/* If the first packet to come in isn't a header, don't even try. */
if (packet->type != SR_DF_HEADER && o == NULL)
unitsize = (logic_probelist->len + 7) / 8;
if (opt_pds && logic_probelist->len) {
- if (sr_info_get(sdi->driver, SR_DI_CUR_SAMPLERATE,
+ if (sr_info_get(sdi->driver, SR_CONF_SAMPLERATE,
(const void **)&samplerate, sdi) != SR_OK) {
g_critical("Unable to initialize protocol "
"decoders: no samplerate found.");
o = NULL;
break;
+ case SR_DF_META:
+ g_debug("cli: received SR_DF_META");
+ meta = packet->payload;
+ for (l = meta->config; l; l = l->next) {
+ src = l->data;
+ switch (src->key) {
+ case SR_CONF_SAMPLERATE:
+ samplerate = (uint64_t *)src->value;
+ g_debug("cli: got samplerate %"PRIu64, *samplerate);
+ break;
+ default:
+ /* Unknown metadata is not an error. */
+ break;
+ }
+ }
+ break;
+
case SR_DF_TRIGGER:
g_debug("cli: received SR_DF_TRIGGER");
if (o->format->event)
g_hash_table_iter_init(&iter, args);
while (g_hash_table_iter_next(&iter, &key, &value)) {
- if (!(srci = sr_devopt_name_get(key))) {
+ if (!(srci = sr_config_info_name_get(key))) {
g_critical("Unknown device option '%s'.", (char *) key);
return SR_ERR;
}
return SR_ERR;
}
- if (sr_driver_hwcap_exists(sdi->driver, SR_HWCAP_LIMIT_MSEC)) {
- if (sr_dev_config_set(sdi, SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) {
+ 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) {
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_HWCAP_SAMPLERATE)) {
- sr_info_get(sdi->driver, SR_DI_CUR_SAMPLERATE,
+ if (sr_dev_has_hwcap(sdi, SR_CONF_SAMPLERATE)) {
+ sr_info_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_HWCAP_LIMIT_SAMPLES,
+ if (sr_dev_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_HWCAP_CONTINUOUS)) {
+ if (!sr_driver_hwcap_exists(sdi->driver, 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_HWCAP_LIMIT_SAMPLES,
+ || (sr_dev_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_HWCAP_LIMIT_FRAMES,
+ || (sr_dev_config_set(sdi, SR_CONF_LIMIT_FRAMES,
&limit_frames) != SR_OK)) {
g_critical("Failed to configure frame limit.");
sr_session_destroy();
projects / sigrok-cli.git / blobdiff