X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_file.c;h=1e76028d1e01cd8ff3cbc68e3a2673de1e47df45;hb=79bb0e97d53526ef6deb491ea9c7698ed6e90631;hp=c4f0db63d4072340307ee3c490bab0c5e98cf909;hpb=1953564a96798bc298d1c94eb90c129adbde1c9e;p=libsigrok.git

diff --git a/session_file.c b/session_file.c
index c4f0db63..1e76028d 100644
--- a/session_file.c
+++ b/session_file.c
@@ -146,18 +146,18 @@ SR_API int sr_session_load(const char *filename)
 						/* first device, init the driver */
 						sdi->driver->init(NULL);
 					sr_session_dev_add(sdi);
-					sdi->driver->dev_config_set(sdi, SR_CONF_SESSIONFILE, filename);
-					sdi->driver->dev_config_set(sdi, SR_CONF_CAPTUREFILE, val);
+					sdi->driver->config_set(SR_CONF_SESSIONFILE, filename, sdi);
+					sdi->driver->config_set(SR_CONF_CAPTUREFILE, val, sdi);
 					g_ptr_array_add(capturefiles, val);
 				} else if (!strcmp(keys[j], "samplerate")) {
 					sr_parse_sizestring(val, &tmp_u64);
-					sdi->driver->dev_config_set(sdi, SR_CONF_SAMPLERATE, &tmp_u64);
+					sdi->driver->config_set(SR_CONF_SAMPLERATE, &tmp_u64, sdi);
 				} else if (!strcmp(keys[j], "unitsize")) {
 					tmp_u64 = strtoull(val, NULL, 10);
-					sdi->driver->dev_config_set(sdi, SR_CONF_CAPTURE_UNITSIZE, &tmp_u64);
+					sdi->driver->config_set(SR_CONF_CAPTURE_UNITSIZE, &tmp_u64, sdi);
 				} else if (!strcmp(keys[j], "total probes")) {
 					total_probes = strtoull(val, NULL, 10);
-					sdi->driver->dev_config_set(sdi, SR_CONF_CAPTURE_NUM_PROBES, &total_probes);
+					sdi->driver->config_set(SR_CONF_CAPTURE_NUM_PROBES, &total_probes, sdi);
 					for (p = 0; p < total_probes; p++) {
 						snprintf(probename, SR_MAX_PROBENAME_LEN, "%" PRIu64, p);
 						if (!(probe = sr_probe_new(p, SR_PROBE_LOGIC, TRUE,
@@ -253,8 +253,8 @@ SR_API int sr_session_save(const char *filename, const struct sr_dev_inst *sdi,
 	fprintf(meta, "capturefile = logic-1\n");
 	fprintf(meta, "unitsize = %d\n", unitsize);
 	fprintf(meta, "total probes = %d\n", g_slist_length(sdi->probes));
-	if (sr_dev_has_hwcap(sdi, SR_CONF_SAMPLERATE)) {
-		if (sr_info_get(sdi->driver, SR_DI_CUR_SAMPLERATE,
+	if (sr_dev_has_option(sdi, SR_CONF_SAMPLERATE)) {
+		if (sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
 				(const void **)&samplerate, sdi) == SR_OK) {
 			s = sr_samplerate_string(*samplerate);
 			fprintf(meta, "samplerate = %s\n", s);