X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=main.c;h=f34007ceba4857480b386775d16babef11157d71;hp=50826a5f31c2a51625e8d96823c1e2e7ac068dc6;hb=8b65cdcc7db2ea380003fe98d93782e4343b8e70;hpb=2be182e6437fb082aedca653fdc106d702518db0
diff --git a/main.c b/main.c
index 50826a5..f34007c 100644
--- a/main.c
+++ b/main.c
@@ -17,13 +17,10 @@
* along with this program. If not, see .
*/
+#include "sigrok-cli.h"
#include "config.h"
+#include
#include
-#include
-#ifdef HAVE_SRD
-#include /* First, so we avoid a _POSIX_C_SOURCE warning. */
-#endif
-#include "sigrok-cli.h"
struct sr_context *sr_ctx = NULL;
#ifdef HAVE_SRD
@@ -39,14 +36,14 @@ gchar *opt_output_file = NULL;
gchar *opt_drv = NULL;
gchar *opt_config = NULL;
static gchar *opt_probes = NULL;
-gchar *opt_probe_group = NULL;
+gchar *opt_channel_group = NULL;
gchar *opt_triggers = NULL;
gchar *opt_pds = NULL;
#ifdef HAVE_SRD
-gchar *opt_pd_stack = NULL;
-gchar *opt_pd_annotations = NULL;
-gchar *opt_pd_meta = NULL;
-gchar *opt_pd_binary = NULL;
+static gchar *opt_pd_stack = NULL;
+static gchar *opt_pd_annotations = NULL;
+static gchar *opt_pd_meta = NULL;
+static gchar *opt_pd_binary = NULL;
#endif
gchar *opt_input_format = NULL;
gchar *opt_output_format = NULL;
@@ -76,8 +73,8 @@ static GOptionEntry optargs[] = {
"Output format", NULL},
{"probes", 'p', 0, G_OPTION_ARG_STRING, &opt_probes,
"Probes to use", NULL},
- {"probe-group", 'g', 0, G_OPTION_ARG_STRING, &opt_probe_group,
- "Probe groups", NULL},
+ {"channel-group", 'g', 0, G_OPTION_ARG_STRING, &opt_channel_group,
+ "Channel groups", NULL},
{"triggers", 't', 0, G_OPTION_ARG_STRING, &opt_triggers,
"Trigger configuration", NULL},
{"wait-trigger", 'w', 0, G_OPTION_ARG_NONE, &opt_wait_trigger,
@@ -132,26 +129,27 @@ static void logger(const gchar *log_domain, GLogLevelFlags log_level,
}
-int select_probes(struct sr_dev_inst *sdi)
+int select_channels(struct sr_dev_inst *sdi)
{
- struct sr_probe *probe;
- GSList *selected_probes, *l;
-
- if (!opt_probes)
- return SR_OK;
-
- if (!(selected_probes = parse_probestring(sdi, opt_probes)))
- return SR_ERR;
-
- for (l = sdi->probes; l; l = l->next) {
- probe = l->data;
- if (g_slist_find(selected_probes, probe))
- probe->enabled = TRUE;
- else
- probe->enabled = FALSE;
+ struct sr_channel *ch;
+ GSList *selected_channels, *l;
+
+ if (opt_probes) {
+ if (!(selected_channels = parse_channelstring(sdi, opt_probes)))
+ return SR_ERR;
+
+ for (l = sdi->channels; l; l = l->next) {
+ ch = l->data;
+ if (g_slist_find(selected_channels, ch))
+ ch->enabled = TRUE;
+ else
+ ch->enabled = FALSE;
+ }
+ g_slist_free(selected_channels);
}
- g_slist_free(selected_probes);
-
+#ifdef HAVE_SRD
+ map_pd_probes(sdi);
+#endif
return SR_OK;
}
@@ -226,27 +224,27 @@ int main(int argc, char **argv)
g_critical("Failed to create new decode session.");
goto done;
}
- if (register_pds(opt_pds) != 0)
+ if (register_pds(opt_pds, opt_pd_annotations) != 0)
goto done;
- if (setup_pd_stack() != 0)
+ if (setup_pd_stack(opt_pds, opt_pd_stack, opt_pd_annotations) != 0)
goto done;
/* Only one output type is ever shown. */
if (opt_pd_binary) {
- if (setup_pd_binary() != 0)
+ if (setup_pd_binary(opt_pd_binary) != 0)
goto done;
if (srd_pd_output_callback_add(srd_sess, SRD_OUTPUT_BINARY,
show_pd_binary, NULL) != SRD_OK)
goto done;
} else if (opt_pd_meta) {
- if (setup_pd_meta() != 0)
+ if (setup_pd_meta(opt_pd_meta) != 0)
goto done;
if (srd_pd_output_callback_add(srd_sess, SRD_OUTPUT_META,
show_pd_meta, NULL) != SRD_OK)
goto done;
} else {
if (opt_pd_annotations)
- if (setup_pd_annotations() != 0)
+ if (setup_pd_annotations(opt_pd_annotations) != 0)
goto done;
if (srd_pd_output_callback_add(srd_sess, SRD_OUTPUT_ANN,
show_pd_annotations, NULL) != SRD_OK)