X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=show.c;h=5243e53cc07aad1817b37cbd2bb2132a57ce83ac;hb=7ce834c1166fcf57ebb0e20bf4e7ba9e856aa6ce;hp=6b2f9853b0fbf9731b0b237117f804fba2bc8ce3;hpb=21f6f69686721d53b44c2da8d138c8d85780b8d8;p=sigrok-cli.git
diff --git a/show.c b/show.c
index 6b2f985..5243e53 100644
--- a/show.c
+++ b/show.c
@@ -17,101 +17,326 @@
* along with this program. If not, see .
*/
-#include "sigrok-cli.h"
-#include "config.h"
+#include
#include
+#include
+#include "sigrok-cli.h"
-extern gint opt_loglevel;
-extern gchar *opt_pds;
+#define DECODERS_HAVE_TAGS \
+ ((SRD_PACKAGE_VERSION_MAJOR > 0) || \
+ (SRD_PACKAGE_VERSION_MAJOR == 0) && (SRD_PACKAGE_VERSION_MINOR > 5))
-void show_version(void)
+static gint sort_inputs(gconstpointer a, gconstpointer b)
{
- struct sr_dev_driver **drivers;
- struct sr_input_format **inputs;
- struct sr_output_format **outputs;
- int i;
+ 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)
+{
+ return strcmp(sr_output_id_get((struct sr_output_module *)a),
+ sr_output_id_get((struct sr_output_module *)b));
+}
+
+static gint sort_transforms(gconstpointer a, gconstpointer b)
+{
+ return strcmp(sr_transform_id_get((struct sr_transform_module *)a),
+ sr_transform_id_get((struct sr_transform_module *)b));
+}
+
+static gint sort_drivers(gconstpointer a, gconstpointer b)
+{
+ const struct sr_dev_driver *sdda = a, *sddb = b;
+
+ return strcmp(sdda->name, sddb->name);
+}
+
#ifdef HAVE_SRD
- struct srd_decoder *dec;
- const GSList *l;
+static gint sort_pds(gconstpointer a, gconstpointer b)
+{
+ const struct srd_decoder *sda = a, *sdb = b;
+
+ return strcmp(sda->id, sdb->id);
+}
#endif
- printf("sigrok-cli %s\n\n", VERSION);
+void show_version(void)
+{
+ GString *s;
+ GSList *l, *l_orig, *m;
+ char *str;
+ const char *lib, *version;
+
+ printf("sigrok-cli %s\n\n", SC_PACKAGE_VERSION_STRING);
+
+ printf("Libraries and features:\n");
+
+ printf("- libsigrok %s/%s (rt: %s/%s).\n",
+ SR_PACKAGE_VERSION_STRING, SR_LIB_VERSION_STRING,
+ sr_package_version_string_get(), sr_lib_version_string_get());
+
+ s = g_string_sized_new(200);
+ g_string_append(s, " - Libs:\n");
+ l_orig = sr_buildinfo_libs_get();
+ for (l = l_orig; l; l = l->next) {
+ m = l->data;
+ lib = m->data;
+ version = m->next->data;
+ g_string_append_printf(s, " - %s %s\n", lib, version);
+ g_slist_free_full(m, g_free);
+ }
+ g_slist_free(l_orig);
+ s->str[s->len - 1] = '\0';
+ printf("%s\n", s->str);
+ g_string_free(s, TRUE);
+
+ str = sr_buildinfo_host_get();
+ printf(" - Host: %s.\n", str);
+ g_free(str);
+
+ str = sr_buildinfo_scpi_backends_get();
+ printf(" - SCPI backends: %s.\n", str);
+ g_free(str);
- printf("Using libsigrok %s (lib version %s).\n",
- sr_package_version_string_get(), sr_lib_version_string_get());
#ifdef HAVE_SRD
- printf("Using libsigrokdecode %s (lib version %s).\n\n",
- srd_package_version_string_get(), srd_lib_version_string_get());
+ printf("- libsigrokdecode %s/%s (rt: %s/%s).\n",
+ SRD_PACKAGE_VERSION_STRING, SRD_LIB_VERSION_STRING,
+ srd_package_version_string_get(), srd_lib_version_string_get());
+
+ s = g_string_sized_new(200);
+ g_string_append(s, " - Libs:\n");
+ l_orig = srd_buildinfo_libs_get();
+ for (l = l_orig; l; l = l->next) {
+ m = l->data;
+ lib = m->data;
+ version = m->next->data;
+ g_string_append_printf(s, " - %s %s\n", lib, version);
+ g_slist_free_full(m, g_free);
+ }
+ g_slist_free(l_orig);
+ s->str[s->len - 1] = '\0';
+ printf("%s\n", s->str);
+ g_string_free(s, TRUE);
+
+ str = srd_buildinfo_host_get();
+ printf(" - Host: %s.\n", str);
+ g_free(str);
+#endif
+}
+
+void show_supported(void)
+{
+ struct sr_dev_driver **drivers, *driver;
+ const struct sr_input_module **inputs, *input;
+ const struct sr_output_module **outputs, *output;
+ const struct sr_transform_module **transforms, *transform;
+ const GSList *l;
+ GSList *sl;
+ int i;
+#ifdef HAVE_SRD
+ struct srd_decoder *dec;
#endif
printf("Supported hardware drivers:\n");
- drivers = sr_driver_list();
- for (i = 0; drivers[i]; i++) {
- printf(" %-20s %s\n", drivers[i]->name, drivers[i]->longname);
+ drivers = sr_driver_list(sr_ctx);
+ for (sl = NULL, i = 0; drivers[i]; i++)
+ sl = g_slist_append(sl, drivers[i]);
+ sl = g_slist_sort(sl, sort_drivers);
+ for (l = sl; l; l = l->next) {
+ driver = l->data;
+ printf(" %-20s %s\n", driver->name, driver->longname);
}
printf("\n");
+ g_slist_free(sl);
printf("Supported input formats:\n");
inputs = sr_input_list();
- for (i = 0; inputs[i]; i++)
- printf(" %-20s %s\n", inputs[i]->id, inputs[i]->description);
+ for (sl = NULL, i = 0; inputs[i]; 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", 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 (i = 0; outputs[i]; i++)
- printf(" %-20s %s\n", outputs[i]->id, outputs[i]->description);
- printf(" %-20s %s\n", "sigrok", "Default file output format");
+ for (sl = NULL, i = 0; outputs[i]; 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", sr_output_id_get(output),
+ sr_output_description_get(output));
+ }
printf("\n");
+ g_slist_free(sl);
+
+ printf("Supported transform modules:\n");
+ transforms = sr_transform_list();
+ for (sl = NULL, i = 0; transforms[i]; i++)
+ sl = g_slist_append(sl, (gpointer)transforms[i]);
+ sl = g_slist_sort(sl, sort_transforms);
+ for (l = sl; l; l = l->next) {
+ transform = l->data;
+ printf(" %-20s %s\n", sr_transform_id_get(transform),
+ sr_transform_description_get(transform));
+ }
+ printf("\n");
+ g_slist_free(sl);
#ifdef HAVE_SRD
if (srd_init(NULL) == SRD_OK) {
printf("Supported protocol decoders:\n");
srd_decoder_load_all();
- for (l = srd_decoder_list(); l; l = l->next) {
+ sl = g_slist_copy((GSList *)srd_decoder_list());
+ sl = g_slist_sort(sl, sort_pds);
+ for (l = sl; l; l = l->next) {
dec = l->data;
printf(" %-20s %s\n", dec->id, dec->longname);
/* Print protocol description upon "-l 3" or higher. */
if (opt_loglevel >= SR_LOG_INFO)
printf(" %-20s %s\n", "", dec->desc);
}
+ g_slist_free(sl);
srd_exit();
}
printf("\n");
#endif
}
+void show_supported_wiki(void)
+{
+#ifndef HAVE_SRD
+ printf("Error, libsigrokdecode support not compiled in.");
+#else
+ const GSList *l;
+ GSList *sl;
+ struct srd_decoder *dec;
+
+ if (srd_init(NULL) != SRD_OK)
+ return;
+
+ srd_decoder_load_all();
+ sl = g_slist_copy((GSList *)srd_decoder_list());
+ sl = g_slist_sort(sl, sort_pds);
+
+ printf("== Supported protocol decoders ==\n\n");
+
+ printf("\n\n");
+
+ printf("Number of currently supported protocol decoders: "
+ "'''%d'''.\n\n", g_slist_length(sl));
+
+ printf("{| border=\"0\" style=\"font-size: smaller\" "
+ "class=\"alternategrey sortable sigroktable\"\n"
+ "|-\n!Protocol\n!Tags\n!Input IDs\n!Output IDs\n!Status\n"
+ "!Full name\n!Description\n\n");
+
+ for (l = sl; l; l = l->next) {
+ dec = l->data;
+
+#if DECODERS_HAVE_TAGS
+ GString *tags = g_string_new(NULL);
+ for (GSList *t = dec->tags; t; t = t->next)
+ g_string_append_printf(tags, "%s, ", (char *)t->data);
+ if (tags->len != 0)
+ g_string_truncate(tags, tags->len - 2);
+#endif
+
+ GString *in = g_string_new(NULL);
+ for (GSList *t = dec->inputs; t; t = t->next)
+ g_string_append_printf(in, "%s, ", (char *)t->data);
+ if (in->len == 0)
+ g_string_append_printf(in, "—");
+ else
+ g_string_truncate(in, in->len - 2);
+
+ GString *out = g_string_new(NULL);
+ for (GSList *t = dec->outputs; t; t = t->next)
+ g_string_append_printf(out, "%s, ", (char *)t->data);
+ if (out->len == 0)
+ g_string_append_printf(out, "—");
+ else
+ g_string_truncate(out, out->len - 2);
+
+#if DECODERS_HAVE_TAGS
+ printf("{{pd|%s|%s|%s|%s|%s|%s|%s|supported}}\n",
+ dec->id, dec->name, dec->longname, dec->desc,
+ tags->str, in->str, out->str);
+#else
+ printf("{{pd|%s|%s|%s|%s|%s|%s|supported}}\n",
+ dec->id, dec->name, dec->longname, dec->desc,
+ in->str, out->str);
+#endif
+
+#if DECODERS_HAVE_TAGS
+ g_string_free(tags, TRUE);
+#endif
+ g_string_free(in, TRUE);
+ g_string_free(out, TRUE);
+ }
+ g_slist_free(sl);
+ srd_exit();
+
+ printf("\n|}\n");
+#endif
+}
+
+static gint sort_channels(gconstpointer a, gconstpointer 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;
- GSList *l;
+ struct sr_channel *ch;
+ GSList *sl, *l, *channels;
GString *s;
GVariant *gvar;
+ struct sr_dev_driver *driver;
+ const char *vendor, *model, *version, *sernum;
+
+ driver = sr_dev_inst_driver_get(sdi);
+ vendor = sr_dev_inst_vendor_get(sdi);
+ model = sr_dev_inst_model_get(sdi);
+ version = sr_dev_inst_version_get(sdi);
+ sernum = sr_dev_inst_sernum_get(sdi);
+ channels = sr_dev_inst_channels_get(sdi);
s = g_string_sized_new(128);
- g_string_assign(s, sdi->driver->name);
- if (sr_config_get(sdi->driver, sdi, NULL, SR_CONF_CONN, &gvar) == SR_OK) {
+ g_string_assign(s, driver->name);
+ if (maybe_config_get(driver, sdi, NULL, SR_CONF_CONN, &gvar) == SR_OK) {
g_string_append(s, ":conn=");
g_string_append(s, g_variant_get_string(gvar, NULL));
g_variant_unref(gvar);
}
g_string_append(s, " - ");
- if (sdi->vendor && sdi->vendor[0])
- g_string_append_printf(s, "%s ", sdi->vendor);
- if (sdi->model && sdi->model[0])
- 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 (vendor && vendor[0])
+ g_string_append_printf(s, "%s ", vendor);
+ if (model && model[0])
+ g_string_append_printf(s, "%s ", model);
+ if (version && version[0])
+ g_string_append_printf(s, "%s ", version);
+ if (sernum && sernum[0])
+ g_string_append_printf(s, "[S/N: %s] ", sernum);
+ if (channels) {
+ if (g_slist_length(channels) == 1) {
+ ch = channels->data;
+ g_string_append_printf(s, "with 1 channel: %s", ch->name);
} else {
- g_string_append_printf(s, "with %d probes:", g_slist_length(sdi->probes));
- for (l = sdi->probes; l; l = l->next) {
- probe = l->data;
- g_string_append_printf(s, " %s", probe->name);
+ sl = g_slist_sort(g_slist_copy(channels), sort_channels);
+ g_string_append_printf(s, "with %d channels:", g_slist_length(sl));
+ for (l = sl; l; l = l->next) {
+ ch = l->data;
+ g_string_append_printf(s, " %s", ch->name);
}
+ g_slist_free(sl);
}
}
g_string_append_printf(s, "\n");
@@ -137,22 +362,69 @@ void show_dev_list(void)
}
+void show_drv_detail(struct sr_dev_driver *driver)
+{
+ const struct sr_key_info *srci;
+ GArray *opts;
+ guint i;
+
+ if ((opts = sr_dev_options(driver, NULL, NULL))) {
+ if (opts->len > 0) {
+ printf("Driver functions:\n");
+ for (i = 0; i < opts->len; i++) {
+ if (!(srci = sr_key_info_get(SR_KEY_CONFIG,
+ g_array_index(opts, uint32_t, i))))
+ continue;
+ printf(" %s\n", srci->name);
+ }
+ }
+ g_array_free(opts, TRUE);
+ }
+
+ if ((opts = sr_driver_scan_options_list(driver))) {
+ if (opts->len > 0) {
+ printf("Scan options:\n");
+ for (i = 0; i < opts->len; i++) {
+ if (!(srci = sr_key_info_get(SR_KEY_CONFIG,
+ g_array_index(opts, uint32_t, i))))
+ continue;
+ printf(" %s\n", srci->id);
+ }
+ }
+ g_array_free(opts, TRUE);
+ }
+}
+
void show_dev_detail(void)
{
+ struct sr_dev_driver *driver_from_opt, *driver;
struct sr_dev_inst *sdi;
- const struct sr_config_info *srci;
- struct sr_probe *probe;
- struct sr_probe_group *probe_group, *pg;
- GSList *devices, *pgl, *prl;
- GVariant *gvar_opts, *gvar_dict, *gvar_list, *gvar;
- gsize num_opts, num_elements;
- const uint64_t *uint64, p, q, low, high;
- uint64_t cur_low, cur_high;
- const int32_t *opts;
- unsigned int num_devices, o, i;
- char *tmp_str;
- char *s;
- const char *charopts, **stropts;
+ const struct sr_key_info *srci, *srmqi, *srmqfi;
+ struct sr_channel *ch;
+ struct sr_channel_group *channel_group, *cg;
+ GSList *devices, *cgl, *chl, *channel_groups;
+ GVariant *gvar_dict, *gvar_list, *gvar;
+ gsize num_elements;
+ double dlow, dhigh, dcur_low, dcur_high;
+ const uint64_t *uint64;
+ uint64_t cur_rate, rate;
+ uint64_t p = 0, q = 0, low = 0, high = 0;
+ uint64_t tmp_uint64, mask, cur_low, cur_high, cur_p, cur_q;
+ GArray *opts;
+ const int32_t *int32;
+ uint32_t key, o, cur_mq, mq;
+ uint64_t cur_mqflags, mqflags;
+ unsigned int num_devices, i, j;
+ char *tmp_str, *s, c;
+ const char **stropts;
+ double tmp_flt;
+ gboolean have_tmp_flt;
+ const double *fltopts;
+
+ if (parse_driver(opt_drv, &driver_from_opt, NULL)) {
+ /* A driver was specified, report driver-wide options now. */
+ show_drv_detail(driver_from_opt);
+ }
if (!(devices = device_scan())) {
g_critical("No devices found.");
@@ -167,78 +439,129 @@ void show_dev_detail(void)
}
sdi = devices->data;
+ g_slist_free(devices);
print_dev_line(sdi);
+ driver = sr_dev_inst_driver_get(sdi);
+ channel_groups = sr_dev_inst_channel_groups_get(sdi);
+
if (sr_dev_open(sdi) != SR_OK) {
g_critical("Failed to open device.");
return;
}
- if ((sr_config_list(sdi->driver, NULL, NULL, SR_CONF_SCAN_OPTIONS,
- &gvar_opts) == SR_OK)) {
- opts = g_variant_get_fixed_array(gvar_opts, &num_elements,
- sizeof(int32_t));
- printf("Supported driver options:\n");
- for (i = 0; i < num_elements; i++) {
- if (!(srci = sr_config_info_get(opts[i])))
- continue;
- printf(" %s\n", srci->id);
- }
- g_variant_unref(gvar_opts);
- }
+ /*
+ * Selected channels and channel group may affect which options are
+ * returned, or which values for them.
+ */
+ select_channels(sdi);
+ channel_group = lookup_channel_group(sdi, NULL);
- probe_group = select_probe_group(sdi);
- if ((sr_config_list(sdi->driver, sdi, probe_group, SR_CONF_DEVICE_OPTIONS,
- &gvar_opts)) != SR_OK)
+ if (!(opts = sr_dev_options(driver, sdi, channel_group)))
/* Driver supports no device instance options. */
return;
- if (sdi->probe_groups) {
- printf("Probe groups:\n");
- for (pgl = sdi->probe_groups; pgl; pgl = pgl->next) {
- pg = pgl->data;
- printf(" %s: channel%s", pg->name,
- g_slist_length(pg->probes) > 1 ? "s" : "");
- for (prl = pg->probes; prl; prl = prl->next) {
- probe = prl->data;
- printf(" %s", probe->name);
+ if (channel_groups) {
+ printf("Channel groups:\n");
+ for (cgl = channel_groups; cgl; cgl = cgl->next) {
+ cg = cgl->data;
+ printf(" %s: ", cg->name);
+ if (g_slist_length(cg->channels) == 0)
+ printf("No channels");
+ else
+ printf("channel%s", g_slist_length(cg->channels) > 1 ? "s" : "");
+ for (chl = cg->channels; chl; chl = chl->next) {
+ ch = chl->data;
+ printf(" %s", ch->name);
}
printf("\n");
}
}
printf("Supported configuration options");
- if (sdi->probe_groups) {
- if (!probe_group)
- printf(" across all probe groups");
+ if (channel_groups) {
+ if (!channel_group)
+ printf(" across all channel groups");
else
- printf(" on probe group %s", probe_group->name);
+ printf(" on channel group %s", channel_group->name);
}
printf(":\n");
- opts = g_variant_get_fixed_array(gvar_opts, &num_opts, sizeof(int32_t));
- for (o = 0; o < num_opts; o++) {
- if (!(srci = sr_config_info_get(opts[o])))
+ for (o = 0; o < opts->len; o++) {
+ key = g_array_index(opts, uint32_t, o);
+ if (!(srci = sr_key_info_get(SR_KEY_CONFIG, key)))
continue;
- if (srci->key == SR_CONF_TRIGGER_TYPE) {
- if (sr_config_list(sdi->driver, sdi, probe_group, srci->key,
- &gvar) != SR_OK) {
+ if (key == SR_CONF_TRIGGER_MATCH) {
+ if (maybe_config_list(driver, sdi, channel_group, key,
+ &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 (key == SR_CONF_LIMIT_SAMPLES
+ && (sr_dev_config_capabilities_list(sdi, NULL, key)
+ & SR_CONF_LIST)) {
+ /*
+ * If implemented in config_list(), this denotes the
+ * maximum number of samples a device can send. This
+ * really applies only to logic analyzers, and then
+ * only to those that don't support compression, or
+ * have it turned off by default. The values returned
+ * are the low/high limits.
+ */
+ if (sr_config_list(driver, sdi, channel_group, key,
+ &gvar) == SR_OK) {
+ g_variant_get(gvar, "(tt)", &low, &high);
+ g_variant_unref(gvar);
+ printf(" Maximum number of samples: %"PRIu64"\n", high);
+ }
- } else if (srci->key == SR_CONF_SAMPLERATE) {
+ } else if (key == SR_CONF_SAMPLERATE) {
/* Supported samplerates */
printf(" %s", srci->id);
- if (sr_config_list(sdi->driver, sdi, probe_group, SR_CONF_SAMPLERATE,
+ cur_rate = ~0ull;
+ if (maybe_config_get(driver, sdi, channel_group,
+ SR_CONF_SAMPLERATE, &gvar) == SR_OK) {
+ if (g_variant_is_of_type(gvar, G_VARIANT_TYPE_UINT64))
+ cur_rate = g_variant_get_uint64(gvar);
+ g_variant_unref(gvar);
+ }
+ if (maybe_config_list(driver, sdi, channel_group, SR_CONF_SAMPLERATE,
&gvar_dict) != SR_OK) {
printf("\n");
continue;
@@ -249,9 +572,14 @@ void show_dev_detail(void)
&num_elements, sizeof(uint64_t));
printf(" - supported samplerates:\n");
for (i = 0; i < num_elements; i++) {
- if (!(s = sr_samplerate_string(uint64[i])))
+ rate = uint64[i];
+ s = sr_samplerate_string(rate);
+ if (!s)
continue;
- printf(" %s\n", s);
+ printf(" %s", s);
+ if (rate == cur_rate)
+ printf(" (current)");
+ printf("\n");
g_free(s);
}
g_variant_unref(gvar_list);
@@ -278,71 +606,52 @@ void show_dev_detail(void)
}
g_variant_unref(gvar_dict);
- } else if (srci->key == SR_CONF_BUFFERSIZE) {
- /* Supported buffer sizes */
- printf(" %s", srci->id);
- if (sr_config_list(sdi->driver, sdi, probe_group,
- SR_CONF_BUFFERSIZE, &gvar_list) != SR_OK) {
+ } else if (srci->datatype == SR_T_UINT64) {
+ printf(" %s: ", srci->id);
+ gvar = NULL;
+ if (maybe_config_get(driver, sdi, channel_group, key,
+ &gvar) == SR_OK) {
+ tmp_uint64 = g_variant_get_uint64(gvar);
+ g_variant_unref(gvar);
+ } else
+ tmp_uint64 = 0;
+ if (maybe_config_list(driver, sdi, channel_group,
+ key, &gvar_list) != SR_OK) {
+ if (gvar) {
+ /* Can't list it, but we have a value to show. */
+ printf("%"PRIu64" (current)", tmp_uint64);
+ }
printf("\n");
continue;
}
uint64 = g_variant_get_fixed_array(gvar_list,
&num_elements, sizeof(uint64_t));
- printf(" - supported buffer sizes:\n");
- for (i = 0; i < num_elements; i++)
- printf(" %"PRIu64"\n", uint64[i]);
- g_variant_unref(gvar_list);
-
- } else if (srci->key == SR_CONF_TIMEBASE) {
- /* Supported time bases */
- printf(" %s", srci->id);
- if (sr_config_list(sdi->driver, sdi, probe_group,
- SR_CONF_TIMEBASE, &gvar_list) != SR_OK) {
- printf("\n");
- continue;
- }
- printf(" - supported time bases:\n");
- num_elements = g_variant_n_children(gvar_list);
+ printf(" - supported values:\n");
for (i = 0; i < num_elements; i++) {
- gvar = g_variant_get_child_value(gvar_list, i);
- g_variant_get(gvar, "(tt)", &p, &q);
- s = sr_period_string(p * q);
- printf(" %s\n", s);
- g_free(s);
- }
- g_variant_unref(gvar_list);
-
- } else if (srci->key == SR_CONF_VDIV) {
- /* Supported volts/div values */
- printf(" %s", srci->id);
- if (sr_config_list(sdi->driver, sdi, probe_group,
- SR_CONF_VDIV, &gvar_list) != SR_OK) {
+ printf(" %"PRIu64, uint64[i]);
+ if (gvar && tmp_uint64 == uint64[i])
+ printf(" (current)");
printf("\n");
- continue;
- }
- printf(" - supported volts/div:\n");
- num_elements = g_variant_n_children(gvar_list);
- for (i = 0; i < num_elements; i++) {
- gvar = g_variant_get_child_value(gvar_list, i);
- g_variant_get(gvar, "(tt)", &p, &q);
- s = sr_voltage_string(p, q);
- printf(" %s\n", s);
- g_free(s);
}
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, probe_group, srci->key,
+ if (maybe_config_get(driver, sdi, channel_group, key,
&gvar) == SR_OK) {
tmp_str = g_strdup(g_variant_get_string(gvar, NULL));
g_variant_unref(gvar);
} else
tmp_str = NULL;
- if (sr_config_list(sdi->driver, sdi, probe_group, srci->key,
+ if (maybe_config_list(driver, sdi, channel_group, 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");
+ g_free(tmp_str);
continue;
}
@@ -361,13 +670,13 @@ void show_dev_detail(void)
} else if (srci->datatype == SR_T_UINT64_RANGE) {
printf(" %s: ", srci->id);
- if (sr_config_list(sdi->driver, sdi, probe_group, srci->key,
+ if (maybe_config_list(driver, sdi, channel_group, key,
&gvar_list) != SR_OK) {
printf("\n");
continue;
}
- if (sr_config_get(sdi->driver, sdi, NULL, srci->key, &gvar) == SR_OK) {
+ if (maybe_config_get(driver, sdi, channel_group, key, &gvar) == SR_OK) {
g_variant_get(gvar, "(tt)", &cur_low, &cur_high);
g_variant_unref(gvar);
} else {
@@ -391,7 +700,7 @@ void show_dev_detail(void)
} else if (srci->datatype == SR_T_BOOL) {
printf(" %s: ", srci->id);
- if (sr_config_get(sdi->driver, sdi, NULL, srci->key,
+ if (maybe_config_get(driver, sdi, channel_group, key,
&gvar) == SR_OK) {
if (g_variant_get_boolean(gvar))
printf("on (current), off\n");
@@ -401,29 +710,163 @@ void show_dev_detail(void)
} else
printf("on, off\n");
+ } else if (srci->datatype == SR_T_DOUBLE_RANGE) {
+ printf(" %s: ", srci->id);
+ if (maybe_config_list(driver, sdi, channel_group, key,
+ &gvar_list) != SR_OK) {
+ printf("\n");
+ continue;
+ }
+
+ if (maybe_config_get(driver, sdi, channel_group, key, &gvar) == SR_OK) {
+ g_variant_get(gvar, "(dd)", &dcur_low, &dcur_high);
+ g_variant_unref(gvar);
+ } else {
+ dcur_low = 0;
+ dcur_high = 0;
+ }
+
+ num_elements = g_variant_n_children(gvar_list);
+ for (i = 0; i < num_elements; i++) {
+ gvar = g_variant_get_child_value(gvar_list, i);
+ g_variant_get(gvar, "(dd)", &dlow, &dhigh);
+ g_variant_unref(gvar);
+ if (i)
+ printf(", ");
+ printf("%.1f-%.1f", dlow, dhigh);
+ if (dlow == dcur_low && dhigh == dcur_high)
+ printf(" (current)");
+ }
+ printf("\n");
+ g_variant_unref(gvar_list);
+
+ } else if (srci->datatype == SR_T_FLOAT) {
+ printf(" %s: ", srci->id);
+ tmp_flt = 0.0;
+ have_tmp_flt = FALSE;
+ if (maybe_config_get(driver, sdi, channel_group, key,
+ &gvar) == SR_OK) {
+ tmp_flt = g_variant_get_double(gvar);
+ have_tmp_flt = TRUE;
+ g_variant_unref(gvar);
+ }
+ if (maybe_config_list(driver, sdi, channel_group, key,
+ &gvar) != SR_OK) {
+ if (have_tmp_flt) {
+ /* Can't list, but got a value to show. */
+ printf("%f (current)", tmp_flt);
+ }
+ printf("\n");
+ continue;
+ }
+ fltopts = g_variant_get_fixed_array(gvar,
+ &num_elements, sizeof(tmp_flt));
+ for (i = 0; i < num_elements; i++) {
+ if (i)
+ printf(", ");
+ printf("%f", fltopts[i]);
+ if (have_tmp_flt && fltopts[i] == tmp_flt)
+ printf(" (current)");
+ }
+ printf("\n");
+ g_variant_unref(gvar);
+
+ } else if (srci->datatype == SR_T_RATIONAL_PERIOD
+ || srci->datatype == SR_T_RATIONAL_VOLT) {
+ printf(" %s", srci->id);
+ if (maybe_config_get(driver, sdi, channel_group, key,
+ &gvar) == SR_OK) {
+ g_variant_get(gvar, "(tt)", &cur_p, &cur_q);
+ g_variant_unref(gvar);
+ } else
+ cur_p = cur_q = 0;
+
+ if (maybe_config_list(driver, sdi, channel_group,
+ key, &gvar_list) != SR_OK) {
+ printf("\n");
+ continue;
+ }
+ printf(" - supported values:\n");
+ num_elements = g_variant_n_children(gvar_list);
+ for (i = 0; i < num_elements; i++) {
+ gvar = g_variant_get_child_value(gvar_list, i);
+ g_variant_get(gvar, "(tt)", &p, &q);
+ if (srci->datatype == SR_T_RATIONAL_PERIOD)
+ s = sr_period_string(p, q);
+ else
+ s = sr_voltage_string(p, q);
+ printf(" %s", s);
+ g_free(s);
+ if (p == cur_p && q == cur_q)
+ printf(" (current)");
+ printf("\n");
+ }
+ g_variant_unref(gvar_list);
+
+ } else if (srci->datatype == SR_T_MQ) {
+ printf(" %s: ", srci->id);
+ if (maybe_config_get(driver, sdi, channel_group, key,
+ &gvar) == SR_OK
+ && g_variant_is_of_type(gvar, G_VARIANT_TYPE_TUPLE)
+ && g_variant_n_children(gvar) == 2) {
+ g_variant_get(gvar, "(ut)", &cur_mq, &cur_mqflags);
+ g_variant_unref(gvar);
+ } else
+ cur_mq = cur_mqflags = 0;
+
+ if (maybe_config_list(driver, sdi, channel_group,
+ key, &gvar_list) != SR_OK) {
+ printf("\n");
+ continue;
+ }
+ printf(" - supported measurements:\n");
+ num_elements = g_variant_n_children(gvar_list);
+ for (i = 0; i < num_elements; i++) {
+ printf(" ");
+ gvar = g_variant_get_child_value(gvar_list, i);
+ g_variant_get(gvar, "(ut)", &mq, &mqflags);
+ if ((srmqi = sr_key_info_get(SR_KEY_MQ, mq)))
+ printf("%s", srmqi->id);
+ else
+ printf("%d", mq);
+ for (j = 0, mask = 1; j < 32; j++, mask <<= 1) {
+ if (!(mqflags & mask))
+ continue;
+ if ((srmqfi = sr_key_info_get(SR_KEY_MQFLAGS, mqflags & mask)))
+ printf("/%s", srmqfi->id);
+ else
+ printf("/%" PRIu64, mqflags & mask);
+ }
+ if (mq == cur_mq && mqflags == cur_mqflags)
+ printf(" (current)");
+ printf("\n");
+ }
+ g_variant_unref(gvar_list);
+
} else {
/* Everything else */
printf(" %s\n", srci->id);
}
}
- g_variant_unref(gvar_opts);
+ g_array_free(opts, TRUE);
sr_dev_close(sdi);
- g_slist_free(devices);
}
#ifdef HAVE_SRD
-void show_pd_detail(void)
+static void show_pd_detail_single(const char *pd)
{
- GSList *l;
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, **bin, *val, *doc, *str;
- pdtokens = g_strsplit(opt_pds, ",", -1);
+ pdtokens = g_strsplit(pd, ",", -1);
for (pdtok = pdtokens; *pdtok; pdtok++) {
/* Strip options. */
if ((optsep = strchr(*pdtok, ':')))
@@ -435,43 +878,106 @@ void show_pd_detail(void)
printf("ID: %s\nName: %s\nLong name: %s\nDescription: %s\n",
dec->id, dec->name, dec->longname, dec->desc);
printf("License: %s\n", dec->license);
- printf("Annotations:\n");
+ printf("Possible decoder input IDs:\n");
+ if (dec->inputs) {
+ for (l = dec->inputs; l; l = l->next) {
+ str = l->data;
+ printf("- %s\n", str);
+ }
+ } else {
+ printf("None.\n");
+ }
+ printf("Possible decoder output IDs:\n");
+ if (dec->outputs) {
+ for (l = dec->outputs; l; l = l->next) {
+ str = l->data;
+ printf("- %s\n", str);
+ }
+ } else {
+ printf("None.\n");
+ }
+ printf("Decoder tags:\n");
+#if DECODERS_HAVE_TAGS
+ if (dec->tags) {
+ for (l = dec->tags; l; l = l->next) {
+ str = l->data;
+ printf("- %s\n", str);
+ }
+ } else {
+ printf("None.\n");
+ }
+#endif
+ printf("Annotation classes:\n");
if (dec->annotations) {
for (l = dec->annotations; l; l = l->next) {
ann = l->data;
- printf("- %s\n %s\n", ann[0], ann[1]);
+ printf("- %s: %s\n", ann[0], ann[1]);
+ }
+ } else {
+ printf("None.\n");
+ }
+ printf("Annotation rows:\n");
+ if (dec->annotation_rows) {
+ 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) {
+ 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("Binary classes:\n");
+ if (dec->binary) {
+ for (l = dec->binary; l; l = l->next) {
+ bin = l->data;
+ printf("- %s: %s\n", bin[0], bin[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->name, p->id, 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->name, p->id, p->desc);
+ pdch->id, pdch->name, pdch->desc);
}
} else {
printf("None.\n");
}
+ printf("Options:\n");
if (dec->options) {
- printf("Options:\n");
for (l = dec->options; l; l = l->next) {
o = l->data;
+ printf("- %s: %s (", o->id, o->desc);
+ for (ol = o->values; ol; ol = ol->next) {
+ val = g_variant_print(ol->data, FALSE);
+ printf("%s, ", val);
+ g_free(val);
+ }
val = g_variant_print(o->def, FALSE);
- printf("- %s: %s (default %s)\n", o->id, o->desc, val);
+ printf("default %s)\n", val);
g_free(val);
}
+ } else {
+ printf("None.\n");
}
if ((doc = srd_decoder_doc_get(dec))) {
printf("Documentation:\n%s\n",
@@ -482,5 +988,152 @@ void show_pd_detail(void)
g_strfreev(pdtokens);
}
+
+void show_pd_detail(void)
+{
+ for (int i = 0; opt_pds[i]; i++)
+ show_pd_detail_single(opt_pds[i]);
+}
#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);
+}
+
+void show_transform(void)
+{
+ const struct sr_transform_module *tmod;
+ const struct sr_option **opts;
+ GSList *l;
+ int i;
+ char *s, **tok;
+
+ tok = g_strsplit(opt_transform_module, ":", 0);
+ if (!tok[0] || !(tmod = sr_transform_find(tok[0])))
+ g_critical("Transform module '%s' not found.", opt_transform_module);
+
+ printf("ID: %s\nName: %s\n", sr_transform_id_get(tmod),
+ sr_transform_name_get(tmod));
+ printf("Description: %s\n", sr_transform_description_get(tmod));
+ if ((opts = sr_transform_options_get(tmod))) {
+ 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_transform_options_free(opts);
+ }
+ g_strfreev(tok);
+}
+
+static void print_serial_port(gpointer data, gpointer user_data)
+{
+ struct sr_serial_port *port;
+
+ port = (void *)data;
+ (void)user_data;
+ printf(" %s\t%s\n", port->name, port->description);
+}
+
+void show_serial_ports(void)
+{
+ GSList *serial_ports;
+
+ serial_ports = sr_serial_list(NULL);
+ if (!serial_ports)
+ return;
+
+ printf("Available serial/HID/BT/BLE ports:\n");
+ g_slist_foreach(serial_ports, print_serial_port, NULL);
+ g_slist_free_full(serial_ports, (GDestroyNotify)sr_serial_free);
+}