X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=session.c;h=8b64f49630a608d5d89d93098d973410a26dfc36;hp=65c4c60c51b6a8f5ff8a9f27ccede18189e802c4;hb=0b34fecd023e6b2d2fd70e67c6c4f59bb06e299b;hpb=426d0cdaa91051c30d45055b3c10662fd392ea5a

diff --git a/session.c b/session.c
index 65c4c60..8b64f49 100644
--- a/session.c
+++ b/session.c
@@ -145,7 +145,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 	const struct sr_datafeed_logic *logic;
 	const struct sr_datafeed_analog *analog;
 	struct sr_config *src;
-	struct sr_probe *probe;
+	struct sr_channel *ch;
 	static struct sr_output *o = NULL;
 	static uint64_t rcvd_samples_logic = 0;
 	static uint64_t rcvd_samples_analog = 0;
@@ -158,7 +158,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 	uint64_t output_len, input_len;
 	uint8_t *output_buf;
 	int i;
-	char **probes;
+	char **channels;
 
 	(void) cb_data;
 
@@ -278,16 +278,16 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 			/* Saving to a session file. */
 			if (rcvd_samples_logic == 0) {
 				/* First packet with logic data, init session file. */
-				probes = g_malloc(sizeof(char *) * g_slist_length(sdi->probes));
-				for (i = 0, l = sdi->probes; l; l = l->next) {
-					probe = l->data;
-					if (probe->enabled && probe->type == SR_PROBE_LOGIC)
-						probes[i++] = probe->name;
+				channels = g_malloc(sizeof(char *) * g_slist_length(sdi->channels));
+				for (i = 0, l = sdi->channels; l; l = l->next) {
+					ch = l->data;
+					if (ch->enabled && ch->type == SR_CHANNEL_LOGIC)
+						channels[i++] = ch->name;
 				}
-				probes[i] = NULL;
+				channels[i] = NULL;
 				sr_session_save_init(opt_output_file, samplerate,
-						probes);
-				g_free(probes);
+						channels);
+				g_free(channels);
 			}
 			save_chunk_logic(logic->data, input_len, logic->unitsize);
 		} else {
@@ -506,7 +506,7 @@ int opt_to_gvar(char *key, char *value, struct sr_config *src)
 int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args)
 {
 	struct sr_config src;
-	struct sr_probe_group *pg;
+	struct sr_channel_group *cg;
 	GHashTableIter iter;
 	gpointer key, value;
 	int ret;
@@ -515,8 +515,8 @@ int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args)
 	while (g_hash_table_iter_next(&iter, &key, &value)) {
 		if ((ret = opt_to_gvar(key, value, &src)) != 0)
 			return ret;
-		pg = select_probe_group(sdi);
-		ret = sr_config_set(sdi, pg, src.key, src.data);
+		cg = select_channel_group(sdi);
+		ret = sr_config_set(sdi, cg, src.key, src.data);
 		if (ret != SR_OK) {
 			g_critical("Failed to set device option '%s'.", (char *)key);
 			return ret;
@@ -533,7 +533,7 @@ void run_session(void)
 	GVariant *gvar;
 	struct sr_dev_inst *sdi;
 	uint64_t min_samples, max_samples;
-	int max_probes, i;
+	int max_channels, i;
 	char **triggerlist;
 
 	devices = device_scan();
@@ -569,8 +569,8 @@ void run_session(void)
 		}
 	}
 
-	if (select_probes(sdi) != SR_OK) {
-		g_critical("Failed to set probes.");
+	if (select_channels(sdi) != SR_OK) {
+		g_critical("Failed to set channels.");
 		sr_session_destroy();
 		return;
 	}
@@ -580,8 +580,8 @@ void run_session(void)
 			sr_session_destroy();
 			return;
 		}
-		max_probes = g_slist_length(sdi->probes);
-		for (i = 0; i < max_probes; i++) {
+		max_channels = g_slist_length(sdi->channels);
+		for (i = 0; i < max_channels; i++) {
 			if (triggerlist[i]) {
 				sr_dev_trigger_set(sdi, i, triggerlist[i]);
 				g_free(triggerlist[i]);