X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=show.c;h=eca05b8b92216145dc998213b32e8b6b75efc1ee;hp=957560f333a48637ce85f2306afbf7f7b6a8a801;hb=c5e0e72ee3bcc799d1510c9fb91b3a0073766b2a;hpb=e950559979908f828a903ede8a50bde091566eed
diff --git a/show.c b/show.c
index 957560f..eca05b8 100644
--- a/show.c
+++ b/show.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include "sigrok-cli.h"
@@ -68,7 +69,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());
@@ -224,38 +225,33 @@ void show_dev_list(void)
void show_drv_detail(struct sr_dev_driver *driver)
{
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) {
- opts = g_variant_get_fixed_array(gvar_opts, &num_elements,
- sizeof(uint32_t));
- if (num_elements) {
+ GArray *opts;
+ guint i;
+
+ if ((opts = sr_dev_options(driver, NULL, NULL))) {
+ if (opts->len > 0) {
printf("Driver functions:\n");
- for (i = 0; i < num_elements; i++) {
- if (!(srci = sr_key_info_get(SR_KEY_CONFIG, opts[i] & SR_CONF_MASK)))
+ 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_variant_unref(gvar_opts);
+ g_array_free(opts, TRUE);
}
- 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) {
+ if ((opts = sr_driver_scan_options_list(driver))) {
+ if (opts->len > 0) {
printf("Scan options:\n");
- for (i = 0; i < num_elements; i++) {
- if (!(srci = sr_key_info_get(SR_KEY_CONFIG, opts[i] & SR_CONF_MASK)))
+ 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_variant_unref(gvar_opts);
+ g_array_free(opts, TRUE);
}
}
@@ -267,12 +263,12 @@ void show_dev_detail(void)
struct sr_channel *ch;
struct sr_channel_group *channel_group, *cg;
GSList *devices, *cgl, *chl, *channel_groups;
- GVariant *gvar_opts, *gvar_dict, *gvar_list, *gvar, *element;
- gsize num_opts, num_elements;
+ GVariant *gvar_dict, *gvar_list, *gvar;
+ gsize num_elements;
double dlow, dhigh, dcur_low, dcur_high;
const uint64_t *uint64, p, q, low, high;
uint64_t tmp_uint64, mask, cur_low, cur_high, cur_p, cur_q;
- const uint32_t *opts;
+ GArray *opts;
const int32_t *int32;
uint32_t key, o, cur_mq, mq;
uint64_t cur_mqflags, mqflags;
@@ -316,8 +312,7 @@ void show_dev_detail(void)
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 (!(opts = sr_dev_options(driver, sdi, channel_group)))
/* Driver supports no device instance options. */
return;
@@ -343,9 +338,8 @@ void show_dev_detail(void)
printf(" on channel group %s", channel_group->name);
}
printf(":\n");
- 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;
+ 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;
@@ -392,7 +386,8 @@ void show_dev_detail(void)
g_variant_unref(gvar_list);
} else if (key == SR_CONF_LIMIT_SAMPLES
- && config_key_has_cap(driver, sdi, NULL, key, SR_CONF_LIST)) {
+ && (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
@@ -626,15 +621,13 @@ void show_dev_detail(void)
}
g_variant_unref(gvar_list);
- } else if (srci->datatype == SR_T_MQLIST) {
+ } 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_ARRAY)
- && g_variant_n_children(gvar) == 1) {
- element = g_variant_get_child_value(gvar, 0);
- g_variant_get(element, "(ut)", &cur_mq, &cur_mqflags);
- g_variant_unref(element);
+ && 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;
@@ -660,7 +653,7 @@ void show_dev_detail(void)
if ((srmqfi = sr_key_info_get(SR_KEY_MQFLAGS, mqflags & mask)))
printf("/%s", srmqfi->id);
else
- printf("/%ld", mqflags & mask);
+ printf("/%" PRIu64, mqflags & mask);
}
if (mq == cur_mq && mqflags == cur_mqflags)
printf(" (current)");
@@ -674,14 +667,14 @@ void show_dev_detail(void)
printf(" %s\n", srci->id);
}
}
- g_variant_unref(gvar_opts);
+ g_array_free(opts, TRUE);
sr_dev_close(sdi);
}
#ifdef HAVE_SRD
-void show_pd_detail(void)
+static void show_pd_detail_single(const char *pd)
{
struct srd_decoder *dec;
struct srd_decoder_option *o;
@@ -689,9 +682,9 @@ void show_pd_detail(void)
struct srd_decoder_annotation_row *r;
GSList *l, *ll, *ol;
int idx;
- char **pdtokens, **pdtok, *optsep, **ann, *val, *doc;
+ char **pdtokens, **pdtok, *optsep, **ann, **bin, *val, *doc;
- pdtokens = g_strsplit(opt_pds, ",", -1);
+ pdtokens = g_strsplit(pd, ",", -1);
for (pdtok = pdtokens; *pdtok; pdtok++) {
/* Strip options. */
if ((optsep = strchr(*pdtok, ':')))
@@ -729,6 +722,15 @@ void show_pd_detail(void)
} 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 channels:\n");
if (dec->channels) {
for (l = dec->channels; l; l = l->next) {
@@ -775,6 +777,12 @@ 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)