Rename 'probe' to 'channel' everywhere.

Variables of type 'struct srd_channel *' are consistently named 'pdch' to
make them easily distinguishable from libsigrok's 'struct sr_channel *'
variables that are consistently named 'ch'.

2 files changed, 34 insertions, 34 deletions

diff --git a/tests/pdtest b/tests/pdtest
index ebfcb28..57a8b54 100755
--- a/tests/pdtest
+++ b/tests/pdtest
@@ -110,7 +110,7 @@ def parse_testfile(path, pd, tc, op_type, op_class):
                     raise E_syntax
                 pd_spec = {
                     'name': f.pop(0),
-                    'probes': [],
+                    'channels': [],
                     'options': [],
                 }
                 while len(f):
@@ -122,12 +122,12 @@ def parse_testfile(path, pd, tc, op_type, op_class):
                     if '=' not in b:
                         raise E_syntax
                     opt, val = b.split('=')
-                    if a == 'probe':
+                    if a == 'channel':
                         try:
                             val = int(val)
                         except:
                             raise E_syntax
-                        pd_spec['probes'].append([opt, val])
+                        pd_spec['channels'].append([opt, val])
                     elif a == 'option':
                         pd_spec['options'].append([opt, val])
                     else:
@@ -314,8 +314,8 @@ def run_tests(tests, fix=False):
                 # Set up PD stack for this test.
                 for spd in tc['pdlist']:
                     args.extend(['-P', spd['name']])
-                    for label, probe in spd['probes']:
-                        args.extend(['-p', "%s=%d" % (label, probe)])
+                    for label, channel in spd['channels']:
+                        args.extend(['-p', "%s=%d" % (label, channel)])
                     for option, value in spd['options']:
                         args.extend(['-o', "%s=%s" % (option, value)])
                 args.extend(['-i', os.path.join(dumps_dir, tc['input'])])
@@ -448,8 +448,8 @@ def show_tests(tests):
                 print("Testcase: %s/%s" % (tc['pd'], tc['name']))
                 for pd in tc['pdlist']:
                     print("  Protocol decoder: %s" % pd['name'])
-                    for label, probe in pd['probes']:
-                        print("    Probe %s=%d" % (label, probe))
+                    for label, channel in pd['channels']:
+                        print("    Channel %s=%d" % (label, channel))
                     for option, value in pd['options']:
                         print("    Option %s=%d" % (option, value))
                 if 'stack' in tc:
diff --git a/tests/runtc.c b/tests/runtc.c
index af1e3fb..25b4e38 100644
--- a/tests/runtc.c
+++ b/tests/runtc.c
@@ -41,9 +41,9 @@ int debug = FALSE;
 int statistics = FALSE;
 char *coverage_report;
 
-struct probe {
+struct channel {
 	char *name;
-	int probe;
+	int channel;
 };
 
 struct option {
@@ -53,7 +53,7 @@ struct option {
 
 struct pd {
 	char *name;
-	GSList *probes;
+	GSList *channels;
 	GSList *options;
 };
 
@@ -140,8 +140,8 @@ static void usage(char *msg)
 	printf("Usage: runtc [-dPpoiOf]\n");
 	printf("  -d  Debug\n");
 	printf("  -P  <protocol decoder>\n");
-	printf("  -p  <probename=probenum> (optional)\n");
-	printf("  -o  <probeoption=value> (optional)\n");
+	printf("  -p  <channelname=channelnum> (optional)\n");
+	printf("  -o  <channeloption=value> (optional)\n");
 	printf("  -i <input file>\n");
 	printf("  -O <output-pd:output-type[:output-class]>\n");
 	printf("  -f <output file> (optional)\n");
@@ -329,13 +329,13 @@ static int run_testcase(char *infile, GSList *pdlist, struct output *op)
 	struct srd_decoder_inst *di, *prev_di;
 	srd_pd_output_callback_t cb;
 	struct pd *pd;
-	struct probe *probe;
+	struct channel *channel;
 	struct option *option;
 	GVariant *gvar;
-	GHashTable *probes, *opts;
+	GHashTable *channels, *opts;
 	GSList *pdl, *l;
 	int idx;
-	int max_probe;
+	int max_channel;
 	char **decoder_class;
 
 	if (op->outfile) {
@@ -385,23 +385,23 @@ static int run_testcase(char *infile, GSList *pdlist, struct output *op)
 			return FALSE;
 		g_hash_table_destroy(opts);
 
-		/* Map probes. */
-		if (pd->probes) {
-			probes = g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
+		/* Map channels. */
+		if (pd->channels) {
+			channels = g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
 					(GDestroyNotify)g_variant_unref);
-			max_probe = 0;
-			for (l = pd->probes; l; l = l->next) {
-				probe = l->data;
-				if (probe->probe > max_probe)
-					max_probe = probe->probe;
-				gvar = g_variant_new_int32(probe->probe);
+			max_channel = 0;
+			for (l = pd->channels; l; l = l->next) {
+				channel = l->data;
+				if (channel->channel > max_channel)
+					max_channel = channel->channel;
+				gvar = g_variant_new_int32(channel->channel);
 				g_variant_ref_sink(gvar);
-				g_hash_table_insert(probes, probe->name, gvar);
+				g_hash_table_insert(channels, channel->name, gvar);
 			}
-			if (srd_inst_probe_set_all(di, probes,
-					(max_probe + 8) / 8) != SRD_OK)
+			if (srd_inst_channel_set_all(di, channels,
+					(max_channel + 8) / 8) != SRD_OK)
 				return FALSE;
-			g_hash_table_destroy(probes);
+			g_hash_table_destroy(channels);
 		}
 
 		/* If this is not the first decoder in the list, stack it
@@ -685,7 +685,7 @@ int main(int argc, char **argv)
 	PyObject *coverage;
 	GSList *pdlist;
 	struct pd *pd;
-	struct probe *probe;
+	struct channel *channel;
 	struct option *option;
 	struct output *op;
 	int ret;
@@ -710,7 +710,7 @@ int main(int argc, char **argv)
 		case 'P':
 			pd = g_malloc(sizeof(struct pd));
 			pd->name = g_strdup(optarg);
-			pd->probes = pd->options = NULL;
+			pd->channels = pd->options = NULL;
 			pdlist = g_slist_append(pdlist, pd);
 			break;
 		case 'p':
@@ -728,11 +728,11 @@ int main(int argc, char **argv)
 				usage(NULL);
 			}
 			if (c == 'p') {
-				probe = malloc(sizeof(struct probe));
-				probe->name = g_strdup(kv[0]);
-				probe->probe = strtoul(kv[1], 0, 10);
+				channel = malloc(sizeof(struct channel));
+				channel->name = g_strdup(kv[0]);
+				channel->channel = strtoul(kv[1], 0, 10);
 				/* Apply to last PD. */
-				pd->probes = g_slist_append(pd->probes, probe);
+				pd->channels = g_slist_append(pd->channels, channel);
 			} else {
 				option = malloc(sizeof(struct option));
 				option->key = g_strdup(kv[0]);