X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=main.c;h=a53566e8960b31b24ce3b89e6e68edd5b62e841d;hp=1b17c526e1a31fca5546a083b7a0e052a8fb3a4b;hb=ad92a2b3072fadfcda1c19c03a27a8fe76984383;hpb=24bd9719166584e3b4e6e6423d6d6bcbc1a88251
diff --git a/main.c b/main.c
index 1b17c52..a53566e 100644
--- a/main.c
+++ b/main.c
@@ -17,9 +17,9 @@
* along with this program. If not, see .
*/
-#include "sigrok-cli.h"
#include
#include
+#include "sigrok-cli.h"
struct sr_context *sr_ctx = NULL;
#ifdef HAVE_SRD
@@ -50,6 +50,7 @@ static void logger(const gchar *log_domain, GLogLevelFlags log_level,
int select_channels(struct sr_dev_inst *sdi)
{
struct sr_channel *ch;
+ gboolean enabled;
GSList *selected_channels, *l, *channels;
channels = sr_dev_inst_channels_get(sdi);
@@ -60,10 +61,9 @@ int select_channels(struct sr_dev_inst *sdi)
for (l = channels; l; l = l->next) {
ch = l->data;
- if (g_slist_find(selected_channels, ch))
- ch->enabled = TRUE;
- else
- ch->enabled = FALSE;
+ enabled = (g_slist_find(selected_channels, ch) != NULL);
+ if (sr_dev_channel_enable(ch, enabled) != SR_OK)
+ return SR_ERR;
}
g_slist_free(selected_channels);
}
@@ -80,22 +80,26 @@ gboolean config_key_has_cap(struct sr_dev_driver *driver,
GVariant *gvar_opts;
const uint32_t *opts;
gsize num_opts, i;
+ gboolean result;
if (sr_config_list(driver, sdi, cg, SR_CONF_DEVICE_OPTIONS,
&gvar_opts) != SR_OK)
return FALSE;
opts = g_variant_get_fixed_array(gvar_opts, &num_opts, sizeof(uint32_t));
+ result = FALSE;
for (i = 0; i < num_opts; i++) {
if ((opts[i] & SR_CONF_MASK) == key) {
if ((opts[i] & capability) == capability)
- return TRUE;
+ result = TRUE;
else
- return FALSE;
+ result = FALSE;
+ break;
}
}
+ g_variant_unref(gvar_opts);
- return FALSE;
+ return result;
}
int maybe_config_get(struct sr_dev_driver *driver,
@@ -269,6 +273,8 @@ int main(int argc, char **argv)
show_input();
else if (opt_output_format && opt_show)
show_output();
+ else if (opt_transform_module && opt_show)
+ show_transform();
else if (opt_scan_devs)
show_dev_list();
#ifdef HAVE_SRD