X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=show.c;h=b191f0caa2715c921ad81b26668c888f8eda7d27;hp=86845ff2d6183385981afae3256677c830b20197;hb=9d6422708d553d1e892f0ad18053901578d9559f;hpb=c6fa2b2e53d04462bd9fd0033b99e9165323762a
diff --git a/show.c b/show.c
index 86845ff..b191f0c 100644
--- a/show.c
+++ b/show.c
@@ -17,9 +17,9 @@
* along with this program. If not, see .
*/
-#include "sigrok-cli.h"
#include
#include
+#include "sigrok-cli.h"
static gint sort_inputs(gconstpointer a, gconstpointer b)
{
@@ -33,6 +33,12 @@ static gint sort_outputs(gconstpointer a, gconstpointer b)
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;
@@ -54,6 +60,7 @@ void show_version(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;
@@ -61,7 +68,7 @@ void show_version(void)
struct srd_decoder *dec;
#endif
- printf("sigrok-cli %s\n\n", VERSION);
+ printf("sigrok-cli %s\n\n", SC_PACKAGE_VERSION_STRING);
printf("Using libsigrok %s (lib version %s).\n",
sr_package_version_string_get(), sr_lib_version_string_get());
@@ -71,7 +78,7 @@ void show_version(void)
#endif
printf("Supported hardware drivers:\n");
- drivers = sr_driver_list();
+ 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);
@@ -108,6 +115,19 @@ void show_version(void)
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");
@@ -152,7 +172,7 @@ static void print_dev_line(const struct sr_dev_inst *sdi)
s = g_string_sized_new(128);
g_string_assign(s, driver->name);
- if (sr_config_get(driver, sdi, NULL, SR_CONF_CONN, &gvar) == SR_OK) {
+ 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);
@@ -203,19 +223,19 @@ void show_dev_list(void)
void show_drv_detail(struct sr_dev_driver *driver)
{
- const struct sr_config_info *srci;
+ const struct sr_key_info *srci;
GVariant *gvar_opts;
const uint32_t *opts;
gsize num_elements, i;
- if ((sr_config_list(driver, NULL, NULL, SR_CONF_DEVICE_OPTIONS,
- &gvar_opts) == SR_OK)) {
+ if (sr_config_list(driver, NULL, NULL, SR_CONF_DEVICE_OPTIONS,
+ &gvar_opts) == SR_OK) {
opts = g_variant_get_fixed_array(gvar_opts, &num_elements,
sizeof(uint32_t));
if (num_elements) {
printf("Driver functions:\n");
for (i = 0; i < num_elements; i++) {
- if (!(srci = sr_config_info_get(opts[i] & SR_CONF_MASK)))
+ if (!(srci = sr_key_info_get(SR_KEY_CONFIG, opts[i] & SR_CONF_MASK)))
continue;
printf(" %s\n", srci->name);
}
@@ -223,14 +243,14 @@ void show_drv_detail(struct sr_dev_driver *driver)
g_variant_unref(gvar_opts);
}
- if ((sr_config_list(driver, NULL, NULL, SR_CONF_SCAN_OPTIONS,
- &gvar_opts) == SR_OK)) {
+ if (sr_config_list(driver, NULL, NULL, SR_CONF_SCAN_OPTIONS,
+ &gvar_opts) == SR_OK) {
opts = g_variant_get_fixed_array(gvar_opts, &num_elements,
sizeof(uint32_t));
if (num_elements) {
printf("Scan options:\n");
for (i = 0; i < num_elements; i++) {
- if (!(srci = sr_config_info_get(opts[i] & SR_CONF_MASK)))
+ if (!(srci = sr_key_info_get(SR_KEY_CONFIG, opts[i] & SR_CONF_MASK)))
continue;
printf(" %s\n", srci->id);
}
@@ -243,7 +263,7 @@ void show_dev_detail(void)
{
struct sr_dev_driver *driver_from_opt, *driver;
struct sr_dev_inst *sdi;
- const struct sr_config_info *srci;
+ 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;
@@ -251,11 +271,12 @@ void show_dev_detail(void)
gsize num_opts, num_elements;
double dlow, dhigh, dcur_low, dcur_high;
const uint64_t *uint64, p, q, low, high;
- uint64_t tmp_uint64, cur_low, cur_high, cur_p, cur_q;
+ uint64_t tmp_uint64, mask, cur_low, cur_high, cur_p, cur_q;
const uint32_t *opts;
const int32_t *int32;
- uint32_t key, o;
- unsigned int num_devices, i;
+ 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;
@@ -288,13 +309,15 @@ void show_dev_detail(void)
return;
}
- /* Selected channels and channel group may affect which options are
- * returned, or which values for them. */
+ /*
+ * Selected channels and channel group may affect which options are
+ * returned, or which values for them.
+ */
select_channels(sdi);
channel_group = select_channel_group(sdi);
- if ((sr_config_list(driver, sdi, channel_group, SR_CONF_DEVICE_OPTIONS,
- &gvar_opts)) != SR_OK)
+ if (sr_config_list(driver, sdi, channel_group, SR_CONF_DEVICE_OPTIONS,
+ &gvar_opts) != SR_OK)
/* Driver supports no device instance options. */
return;
@@ -323,11 +346,11 @@ void show_dev_detail(void)
opts = g_variant_get_fixed_array(gvar_opts, &num_opts, sizeof(uint32_t));
for (o = 0; o < num_opts; o++) {
key = opts[o] & SR_CONF_MASK;
- if (!(srci = sr_config_info_get(key)))
+ if (!(srci = sr_key_info_get(SR_KEY_CONFIG, key)))
continue;
if (key == SR_CONF_TRIGGER_MATCH) {
- if (sr_config_list(driver, sdi, channel_group, key,
+ if (maybe_config_list(driver, sdi, channel_group, key,
&gvar_list) != SR_OK) {
printf("\n");
continue;
@@ -336,7 +359,7 @@ void show_dev_detail(void)
&num_elements, sizeof(int32_t));
printf(" Supported triggers: ");
for (i = 0; i < num_elements; i++) {
- switch(int32[i]) {
+ switch (int32[i]) {
case SR_TRIGGER_ZERO:
c = '0';
break;
@@ -368,25 +391,27 @@ void show_dev_detail(void)
printf("\n");
g_variant_unref(gvar_list);
- } else if (key == SR_CONF_LIMIT_SAMPLES) {
- /* If implemented in config_list(), this denotes the
+ } else if (key == SR_CONF_LIMIT_SAMPLES
+ && config_key_has_cap(driver, 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. */
+ * are the low/high limits.
+ */
if (sr_config_list(driver, sdi, channel_group, key,
- &gvar) != SR_OK) {
- continue;
+ &gvar) == SR_OK) {
+ g_variant_get(gvar, "(tt)", &low, &high);
+ g_variant_unref(gvar);
+ printf(" Maximum number of samples: %"PRIu64"\n", high);
}
- g_variant_get(gvar, "(tt)", &low, &high);
- g_variant_unref(gvar);
- printf(" Maximum number of samples: %"PRIu64"\n", high);
} else if (key == SR_CONF_SAMPLERATE) {
/* Supported samplerates */
printf(" %s", srci->id);
- if (sr_config_list(driver, sdi, channel_group, SR_CONF_SAMPLERATE,
+ if (maybe_config_list(driver, sdi, channel_group, SR_CONF_SAMPLERATE,
&gvar_dict) != SR_OK) {
printf("\n");
continue;
@@ -427,16 +452,16 @@ void show_dev_detail(void)
g_variant_unref(gvar_dict);
} else if (srci->datatype == SR_T_UINT64) {
- printf(" %s", srci->id);
+ printf(" %s: ", srci->id);
gvar = NULL;
- if (sr_config_get(driver, sdi, channel_group, key,
+ 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 (sr_config_list(driver, sdi, channel_group,
- SR_CONF_BUFFERSIZE, &gvar_list) != SR_OK) {
+ 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);
@@ -457,14 +482,14 @@ void show_dev_detail(void)
} else if (srci->datatype == SR_T_STRING) {
printf(" %s: ", srci->id);
- if (sr_config_get(driver, sdi, channel_group, 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(driver, sdi, channel_group, 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. */
@@ -490,13 +515,13 @@ void show_dev_detail(void)
} else if (srci->datatype == SR_T_UINT64_RANGE) {
printf(" %s: ", srci->id);
- if (sr_config_list(driver, sdi, channel_group, key,
+ if (maybe_config_list(driver, sdi, channel_group, key,
&gvar_list) != SR_OK) {
printf("\n");
continue;
}
- if (sr_config_get(driver, sdi, channel_group, 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 {
@@ -520,7 +545,7 @@ void show_dev_detail(void)
} else if (srci->datatype == SR_T_BOOL) {
printf(" %s: ", srci->id);
- if (sr_config_get(driver, sdi, channel_group, key,
+ if (maybe_config_get(driver, sdi, channel_group, key,
&gvar) == SR_OK) {
if (g_variant_get_boolean(gvar))
printf("on (current), off\n");
@@ -532,13 +557,13 @@ void show_dev_detail(void)
} else if (srci->datatype == SR_T_DOUBLE_RANGE) {
printf(" %s: ", srci->id);
- if (sr_config_list(driver, sdi, channel_group, key,
+ if (maybe_config_list(driver, sdi, channel_group, key,
&gvar_list) != SR_OK) {
printf("\n");
continue;
}
- if (sr_config_get(driver, sdi, channel_group, key, &gvar) == SR_OK) {
+ 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 {
@@ -562,7 +587,7 @@ void show_dev_detail(void)
} else if (srci->datatype == SR_T_FLOAT) {
printf(" %s: ", srci->id);
- if (sr_config_get(driver, sdi, channel_group, key,
+ if (maybe_config_get(driver, sdi, channel_group, key,
&gvar) == SR_OK) {
printf("%f\n", g_variant_get_double(gvar));
g_variant_unref(gvar);
@@ -572,14 +597,14 @@ void show_dev_detail(void)
} else if (srci->datatype == SR_T_RATIONAL_PERIOD
|| srci->datatype == SR_T_RATIONAL_VOLT) {
printf(" %s", srci->id);
- if (sr_config_get(driver, sdi, channel_group, key,
+ 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 (sr_config_list(driver, sdi, channel_group,
+ if (maybe_config_list(driver, sdi, channel_group,
key, &gvar_list) != SR_OK) {
printf("\n");
continue;
@@ -601,6 +626,46 @@ void show_dev_detail(void)
}
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("/%ld", mqflags & mask);
+ }
+ if (mq == cur_mq && mqflags == cur_mqflags)
+ printf(" (current)");
+ printf("\n");
+ }
+ g_variant_unref(gvar_list);
+
} else {
/* Everything else */
@@ -790,3 +855,42 @@ void show_output(void)
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);
+}