*/
#include "sigrok-cli.h"
-#include "config.h"
#include <glib.h>
#include <string.h>
-extern gint opt_loglevel;
-extern gchar *opt_pds;
-
static gint sort_inputs(gconstpointer a, gconstpointer b)
{
- const struct sr_input_format *ia = a, *ib = b;
-
- return strcmp(ia->id, ib->id);
+ return strcmp(sr_input_id_get((struct sr_input_module *)a),
+ sr_input_id_get((struct sr_input_module *)b));
}
static gint sort_outputs(gconstpointer a, gconstpointer b)
{
- const struct sr_output_format *oa = a, *ob = b;
-
- return strcmp(oa->id, ob->id);
+ return strcmp(sr_output_id_get((struct sr_output_module *)a),
+ sr_output_id_get((struct sr_output_module *)b));
}
static gint sort_drivers(gconstpointer a, gconstpointer b)
return strcmp(sdda->name, sddb->name);
}
+#ifdef HAVE_SRD
static gint sort_pds(gconstpointer a, gconstpointer b)
{
const struct srd_decoder *sda = a, *sdb = b;
return strcmp(sda->id, sdb->id);
}
+#endif
void show_version(void)
{
struct sr_dev_driver **drivers, *driver;
- struct sr_input_format **inputs, *input;
- struct sr_output_format **outputs, *output;
+ const struct sr_input_module **inputs, *input;
+ const struct sr_output_module **outputs, *output;
const GSList *l;
GSList *sl;
int i;
printf("Supported input formats:\n");
inputs = sr_input_list();
for (sl = NULL, i = 0; inputs[i]; i++)
- sl = g_slist_append(sl, inputs[i]);
+ sl = g_slist_append(sl, (gpointer)inputs[i]);
sl = g_slist_sort(sl, sort_inputs);
for (l = sl; l; l = l->next) {
input = l->data;
- printf(" %-20s %s\n", input->id, input->description);
+ printf(" %-20s %s\n", sr_input_id_get(input),
+ sr_input_description_get(input));
}
printf("\n");
g_slist_free(sl);
printf("Supported output formats:\n");
outputs = sr_output_list();
for (sl = NULL, i = 0; outputs[i]; i++)
- sl = g_slist_append(sl, outputs[i]);
+ sl = g_slist_append(sl, (gpointer)outputs[i]);
sl = g_slist_sort(sl, sort_outputs);
for (l = sl; l; l = l->next) {
output = l->data;
- printf(" %-20s %s\n", output->id, output->description);
+ printf(" %-20s %s\n", sr_output_id_get(output),
+ sr_output_description_get(output));
}
printf("\n");
g_slist_free(sl);
#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;
const uint64_t *uint64, p, q, low, high;
uint64_t cur_low, cur_high;
- const int32_t *opts;
+ const int32_t *int32, *opts;
unsigned int num_devices, o, i;
char *tmp_str;
- char *s;
- const char *charopts, **stropts;
+ char *s, c;
+ const char **stropts;
if (!(devices = device_scan())) {
g_critical("No devices found.");
}
sdi = devices->data;
+ g_slist_free(devices);
print_dev_line(sdi);
if (sr_dev_open(sdi) != SR_OK) {
/* 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");
}
if (!(srci = sr_config_info_get(opts[o])))
continue;
- if (srci->key == SR_CONF_TRIGGER_TYPE) {
+ if (srci->key == SR_CONF_TRIGGER_MATCH) {
if (sr_config_list(sdi->driver, sdi, channel_group, srci->key,
- &gvar) != SR_OK) {
+ &gvar_list) != SR_OK) {
printf("\n");
continue;
}
- charopts = g_variant_get_string(gvar, NULL);
+ int32 = g_variant_get_fixed_array(gvar_list,
+ &num_elements, sizeof(int32_t));
printf(" Supported triggers: ");
- while (*charopts) {
- printf("%c ", *charopts);
- charopts++;
+ for (i = 0; i < num_elements; i++) {
+ switch(int32[i]) {
+ case SR_TRIGGER_ZERO:
+ c = '0';
+ break;
+ case SR_TRIGGER_ONE:
+ c = '1';
+ break;
+ case SR_TRIGGER_RISING:
+ c = 'r';
+ break;
+ case SR_TRIGGER_FALLING:
+ c = 'f';
+ break;
+ case SR_TRIGGER_EDGE:
+ c = 'e';
+ break;
+ case SR_TRIGGER_OVER:
+ c = 'o';
+ break;
+ case SR_TRIGGER_UNDER:
+ c = 'u';
+ break;
+ default:
+ c = 0;
+ break;
+ }
+ if (c)
+ printf("%c ", c);
}
printf("\n");
- g_variant_unref(gvar);
+ g_variant_unref(gvar_list);
} else if (srci->key == SR_CONF_LIMIT_SAMPLES) {
/* If implemented in config_list(), this denotes the
}
g_variant_unref(gvar_list);
- } else if (srci->datatype == SR_T_CHAR) {
+ } else if (srci->datatype == SR_T_STRING) {
printf(" %s: ", srci->id);
if (sr_config_get(sdi->driver, sdi, channel_group, srci->key,
&gvar) == SR_OK) {
if (sr_config_list(sdi->driver, sdi, channel_group, srci->key,
&gvar) != SR_OK) {
+ if (tmp_str) {
+ /* Can't list it, but we have a value to show. */
+ printf("%s (current)", tmp_str);
+ }
printf("\n");
continue;
}
continue;
}
- if (sr_config_get(sdi->driver, sdi, NULL, srci->key, &gvar) == SR_OK) {
+ if (sr_config_get(sdi->driver, sdi, channel_group, srci->key, &gvar) == SR_OK) {
g_variant_get(gvar, "(tt)", &cur_low, &cur_high);
g_variant_unref(gvar);
} else {
} else if (srci->datatype == SR_T_BOOL) {
printf(" %s: ", srci->id);
- if (sr_config_get(sdi->driver, sdi, NULL, srci->key,
+ if (sr_config_get(sdi->driver, sdi, channel_group, srci->key,
&gvar) == SR_OK) {
if (g_variant_get_boolean(gvar))
printf("on (current), off\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;
}
- if (sr_config_get(sdi->driver, sdi, NULL, srci->key, &gvar) == SR_OK) {
+ if (sr_config_get(sdi->driver, sdi, channel_group, srci->key, &gvar) == SR_OK) {
g_variant_get(gvar, "(dd)", &dcur_low, &dcur_high);
g_variant_unref(gvar);
} else {
printf("\n");
g_variant_unref(gvar_list);
+ } else if (srci->datatype == SR_T_FLOAT) {
+ printf(" %s: ", srci->id);
+ if (sr_config_get(sdi->driver, sdi, channel_group, srci->key,
+ &gvar) == SR_OK) {
+ printf("%f\n", g_variant_get_double(gvar));
+ g_variant_unref(gvar);
+ } else
+ printf("on, off\n");
+
} else {
/* Everything else */
g_variant_unref(gvar_opts);
sr_dev_close(sdi);
- g_slist_free(devices);
}
#ifdef HAVE_SRD
void show_pd_detail(void)
{
- GSList *l, *ll, *ol;
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;
+ GSList *l, *ll, *ol;
+ int idx;
+ char **pdtokens, **pdtok, *optsep, **ann, *val, *doc;
pdtokens = g_strsplit(opt_pds, ",", -1);
for (pdtok = pdtokens; *pdtok; pdtok++) {
for (l = dec->annotation_rows; l; l = l->next) {
r = l->data;
printf("- %s (%s): ", r->id, r->desc);
- for (ll = r->ann_classes; ll; ll = ll->next)
- printf("%d ", GPOINTER_TO_INT(ll->data));
+ for (ll = r->ann_classes; ll; ll = ll->next) {
+ idx = GPOINTER_TO_INT(ll->data);
+ ann = g_slist_nth_data(dec->annotations, idx);
+ printf("%s", ann[0]);
+ if (ll->next)
+ printf(", ");
+ }
printf("\n");
}
} 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");
}
#endif
+void show_input(void)
+{
+ const struct sr_input_module *imod;
+ const struct sr_option **opts;
+ GSList *l;
+ int i;
+ char *s, **tok;
+
+ tok = g_strsplit(opt_input_format, ":", 0);
+ if (!tok[0] || !(imod = sr_input_find(tok[0])))
+ g_critical("Input module '%s' not found.", opt_input_format);
+
+ printf("ID: %s\nName: %s\n", sr_input_id_get(imod),
+ sr_input_name_get(imod));
+ printf("Description: %s\n", sr_input_description_get(imod));
+ if ((opts = sr_input_options_get(imod))) {
+ printf("Options:\n");
+ for (i = 0; opts[i]; i++) {
+ printf(" %s: %s", opts[i]->id, opts[i]->desc);
+ if (opts[i]->def) {
+ s = g_variant_print(opts[i]->def, FALSE);
+ printf(" (default %s", s);
+ g_free(s);
+ if (opts[i]->values) {
+ printf(", possible values ");
+ for (l = opts[i]->values; l; l = l->next) {
+ s = g_variant_print((GVariant *)l->data, FALSE);
+ printf("%s%s", s, l->next ? ", " : "");
+ g_free(s);
+ }
+ }
+ printf(")");
+ }
+ printf("\n");
+ }
+ sr_input_options_free(opts);
+ }
+ g_strfreev(tok);
+}
+
+void show_output(void)
+{
+ const struct sr_output_module *omod;
+ const struct sr_option **opts;
+ GSList *l;
+ int i;
+ char *s, **tok;
+
+ tok = g_strsplit(opt_output_format, ":", 0);
+ if (!tok[0] || !(omod = sr_output_find(tok[0])))
+ g_critical("Output module '%s' not found.", opt_output_format);
+
+ printf("ID: %s\nName: %s\n", sr_output_id_get(omod),
+ sr_output_name_get(omod));
+ printf("Description: %s\n", sr_output_description_get(omod));
+ if ((opts = sr_output_options_get(omod))) {
+ printf("Options:\n");
+ for (i = 0; opts[i]; i++) {
+ printf(" %s: %s", opts[i]->id, opts[i]->desc);
+ if (opts[i]->def) {
+ s = g_variant_print(opts[i]->def, FALSE);
+ printf(" (default %s", s);
+ g_free(s);
+ if (opts[i]->values) {
+ printf(", possible values ");
+ for (l = opts[i]->values; l; l = l->next) {
+ s = g_variant_print((GVariant *)l->data, FALSE);
+ printf("%s%s", s, l->next ? ", " : "");
+ g_free(s);
+ }
+ }
+ printf(")");
+ }
+ printf("\n");
+ }
+ sr_output_options_free(opts);
+ }
+ g_strfreev(tok);
+}
+
projects / sigrok-cli.git / blobdiff