Rename 'probe' to 'channel' in most places.

[sigrok-cli.git] / main.c

diff --git a/main.c b/main.c
index 271d28a99271f6c61f77570e897fe45aee32b1d4..f34007ceba4857480b386775d16babef11157d71 100644 (file)
--- a/main.c
+++ b/main.c
@@ -36,7 +36,7 @@ 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
@@ -73,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,
@@ -129,23 +129,23 @@ 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 (!(selected_channels = parse_channelstring(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;
+               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);