X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=session_file.c;h=e8ad2107e4793a28ad229844dd12ad3baf067c81;hb=58d6f20748e6b33677da3b4a388ac3b8fcaa12f7;hp=da11321c09ceba009afd9e00cbc87efd2b14c882;hpb=ba7dd8bbb8168cba432a844259a3e239aa5f36d7;p=libsigrok.git

diff --git a/session_file.c b/session_file.c
index da11321c..e8ad2107 100644
--- a/session_file.c
+++ b/session_file.c
@@ -30,7 +30,9 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
+/** @cond PRIVATE */
 #define LOG_PREFIX "session-file"
+/** @endcond */
 
 /**
  * @file
@@ -117,7 +119,7 @@ SR_API int sr_session_load(const char *filename)
 	int ret, channelnum, devcnt, i, j;
 	uint64_t tmp_u64, total_channels, enabled_channels, p;
 	char **sections, **keys, *metafile, *val;
-	char channelname[SR_MAX_PROBENAME_LEN + 1];
+	char channelname[SR_MAX_CHANNELNAME_LEN + 1];
 
 	if ((ret = sr_sessionfile_check(filename)) != SR_OK)
 		return ret;
@@ -182,11 +184,11 @@ SR_API int sr_session_load(const char *filename)
 							g_variant_new_uint64(tmp_u64), sdi, NULL);
 				} else if (!strcmp(keys[j], "total probes")) {
 					total_channels = strtoull(val, NULL, 10);
-					sdi->driver->config_set(SR_CONF_NUM_LOGIC_PROBES,
+					sdi->driver->config_set(SR_CONF_NUM_LOGIC_CHANNELS,
 							g_variant_new_uint64(total_channels), sdi, NULL);
 					for (p = 0; p < total_channels; p++) {
-						snprintf(channelname, SR_MAX_PROBENAME_LEN, "%" PRIu64, p);
-						if (!(ch = sr_probe_new(p, SR_PROBE_LOGIC, TRUE,
+						snprintf(channelname, SR_MAX_CHANNELNAME_LEN, "%" PRIu64, p);
+						if (!(ch = sr_channel_new(p, SR_CHANNEL_LOGIC, TRUE,
 								channelname)))
 							return SR_ERR;
 						sdi->channels = g_slist_append(sdi->channels, ch);
@@ -197,7 +199,7 @@ SR_API int sr_session_load(const char *filename)
 					enabled_channels++;
 					tmp_u64 = strtoul(keys[j]+5, NULL, 10);
 					/* sr_session_save() */
-					sr_dev_probe_name_set(sdi, tmp_u64 - 1, val);
+					sr_dev_channel_name_set(sdi, tmp_u64 - 1, val);
 				} else if (!strncmp(keys[j], "trigger", 7)) {
 					channelnum = strtoul(keys[j]+7, NULL, 10);
 					sr_dev_trigger_set(sdi, channelnum, val);
@@ -207,7 +209,7 @@ SR_API int sr_session_load(const char *filename)
 			/* Disable channels not specifically listed. */
 			if (total_channels)
 				for (p = enabled_channels; p < total_channels; p++)
-					sr_dev_probe_enable(sdi, p, FALSE);
+					sr_dev_channel_enable(sdi, p, FALSE);
 		}
 		devcnt++;
 	}
@@ -254,7 +256,7 @@ SR_API int sr_session_save(const char *filename, const struct sr_dev_inst *sdi,
 	cnt = 0;
 	for (l = sdi->channels; l; l = l->next) {
 		ch = l->data;
-		if (ch->type != SR_PROBE_LOGIC)
+		if (ch->type != SR_CHANNEL_LOGIC)
 			continue;
 		if (ch->enabled != TRUE)
 			continue;