X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=main.c;h=ff3225fd2b35aee03728911d8efbd1bda71fda24;hp=271d28a99271f6c61f77570e897fe45aee32b1d4;hb=f4ffd032cfb0b8fe927d82bdba136f357b8dad79;hpb=39aedc34ab864e95a395558f8b8d4be3beb11371

diff --git a/main.c b/main.c
index 271d28a..ff3225f 100644
--- a/main.c
+++ b/main.c
@@ -18,7 +18,6 @@
  */
 
 #include "sigrok-cli.h"
-#include "config.h"
 #include <stdlib.h>
 #include <glib.h>
 
@@ -35,8 +34,8 @@ gchar *opt_input_file = NULL;
 gchar *opt_output_file = NULL;
 gchar *opt_drv = NULL;
 gchar *opt_config = NULL;
-static gchar *opt_probes = NULL;
-gchar *opt_probe_group = NULL;
+static gchar *opt_channels = NULL;
+gchar *opt_channel_group = NULL;
 gchar *opt_triggers = NULL;
 gchar *opt_pds = NULL;
 #ifdef HAVE_SRD
@@ -71,10 +70,10 @@ static GOptionEntry optargs[] = {
 			"Save output to file", NULL},
 	{"output-format", 'O', 0, G_OPTION_ARG_STRING, &opt_output_format,
 			"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},
+	{"channels", 'C', 0, G_OPTION_ARG_STRING, &opt_channels,
+			"Channels to use", 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,
@@ -129,26 +128,26 @@ 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;
+	struct sr_channel *ch;
+	GSList *selected_channels, *l;
 
-	if (opt_probes) {
-		if (!(selected_probes = parse_probestring(sdi, opt_probes)))
+	if (opt_channels) {
+		if (!(selected_channels = parse_channelstring(sdi, opt_channels)))
 			return SR_ERR;
 
-		for (l = sdi->probes; l; l = l->next) {
-			probe = l->data;
-			if (g_slist_find(selected_probes, probe))
-				probe->enabled = TRUE;
+		for (l = sdi->channels; l; l = l->next) {
+			ch = l->data;
+			if (g_slist_find(selected_channels, ch))
+				ch->enabled = TRUE;
 			else
-				probe->enabled = FALSE;
+				ch->enabled = FALSE;
 		}
-		g_slist_free(selected_probes);
+		g_slist_free(selected_channels);
 	}
 #ifdef HAVE_SRD
-	map_pd_probes(sdi);
+	map_pd_channels(sdi);
 #endif
 	return SR_OK;
 }
@@ -253,9 +252,6 @@ int main(int argc, char **argv)
 	}
 #endif
 
-	if (setup_output_format() != 0)
-		goto done;
-
 	if (opt_version)
 		show_version();
 	else if (opt_scan_devs)