*/
#include "sigrok-cli.h"
-#include "config.h"
#include <glib.h>
#include <string.h>
#endif
}
-static gint sort_probes(gconstpointer a, gconstpointer b)
+static gint sort_channels(gconstpointer a, gconstpointer b)
{
- const struct sr_probe *pa = a, *pb = b;
+ const struct sr_channel *pa = a, *pb = b;
return pa->index - pb->index;
}
static void print_dev_line(const struct sr_dev_inst *sdi)
{
- struct sr_probe *probe;
+ struct sr_channel *ch;
GSList *sl, *l;
GString *s;
GVariant *gvar;
g_string_append_printf(s, "%s ", sdi->model);
if (sdi->version && sdi->version[0])
g_string_append_printf(s, "%s ", sdi->version);
- if (sdi->probes) {
- if (g_slist_length(sdi->probes) == 1) {
- probe = sdi->probes->data;
- g_string_append_printf(s, "with 1 probe: %s", probe->name);
+ if (sdi->channels) {
+ if (g_slist_length(sdi->channels) == 1) {
+ ch = sdi->channels->data;
+ g_string_append_printf(s, "with 1 channel: %s", ch->name);
} else {
- sl = g_slist_sort(g_slist_copy(sdi->probes), sort_probes);
- g_string_append_printf(s, "with %d probes:", g_slist_length(sl));
+ sl = g_slist_sort(g_slist_copy(sdi->channels), sort_channels);
+ g_string_append_printf(s, "with %d channels:", g_slist_length(sl));
for (l = sl; l; l = l->next) {
- probe = l->data;
- g_string_append_printf(s, " %s", probe->name);
+ ch = l->data;
+ g_string_append_printf(s, " %s", ch->name);
}
g_slist_free(sl);
}
{
struct sr_dev_inst *sdi;
const struct sr_config_info *srci;
- struct sr_probe *probe;
+ struct sr_channel *ch;
struct sr_channel_group *channel_group, *cg;
- GSList *devices, *cgl, *prl;
+ GSList *devices, *cgl, *chl;
GVariant *gvar_opts, *gvar_dict, *gvar_list, *gvar;
gsize num_opts, num_elements;
double dlow, dhigh, dcur_low, dcur_high;
/* Selected channels and channel group may affect which options are
* returned, or which values for them. */
- select_probes(sdi);
+ select_channels(sdi);
channel_group = select_channel_group(sdi);
if ((sr_config_list(sdi->driver, sdi, channel_group, SR_CONF_DEVICE_OPTIONS,
cg = cgl->data;
printf(" %s: channel%s", cg->name,
g_slist_length(cg->channels) > 1 ? "s" : "");
- for (prl = cg->channels; prl; prl = prl->next) {
- probe = prl->data;
- printf(" %s", probe->name);
+ for (chl = cg->channels; chl; chl = chl->next) {
+ ch = chl->data;
+ printf(" %s", ch->name);
}
printf("\n");
}
} else if (srci->datatype == SR_T_DOUBLE_RANGE) {
printf(" %s: ", srci->id);
- if (sr_config_list(sdi->driver, sdi, probe_group, srci->key,
+ if (sr_config_list(sdi->driver, sdi, channel_group, srci->key,
&gvar_list) != SR_OK) {
printf("\n");
continue;
struct srd_decoder *dec;
struct srd_decoder_option *o;
char **pdtokens, **pdtok, *optsep, **ann, *val, *doc;
- struct srd_probe *p;
+ struct srd_channel *pdch;
struct srd_decoder_annotation_row *r;
pdtokens = g_strsplit(opt_pds, ",", -1);
} else {
printf("None.\n");
}
- printf("Required probes:\n");
- if (dec->probes) {
- for (l = dec->probes; l; l = l->next) {
- p = l->data;
+ printf("Required channels:\n");
+ if (dec->channels) {
+ for (l = dec->channels; l; l = l->next) {
+ pdch = l->data;
printf("- %s (%s): %s\n",
- p->id, p->name, p->desc);
+ pdch->id, pdch->name, pdch->desc);
}
} else {
printf("None.\n");
}
- printf("Optional probes:\n");
- if (dec->opt_probes) {
- for (l = dec->opt_probes; l; l = l->next) {
- p = l->data;
+ printf("Optional channels:\n");
+ if (dec->opt_channels) {
+ for (l = dec->opt_channels; l; l = l->next) {
+ pdch = l->data;
printf("- %s (%s): %s\n",
- p->id, p->name, p->desc);
+ pdch->id, pdch->name, pdch->desc);
}
} else {
printf("None.\n");