X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_file.c;h=6b7781626c381b01f9da54a3ab12bf4ac091d790;hb=c9166745f23889e1c5abb010513733c829c00d1b;hp=2883d0dc11bb47bf5362bef2a404a4c28e2e3ea7;hpb=bb7ef79377ae617e1275373e0b631beb7f909d73;p=libsigrok.git

diff --git a/session_file.c b/session_file.c
index 2883d0dc..6b778162 100644
--- a/session_file.c
+++ b/session_file.c
@@ -24,11 +24,11 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include "config.h"
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 extern struct sr_session *session;
-extern SR_PRIV struct sr_dev_plugin session_driver;
+extern SR_PRIV struct sr_dev_driver session_driver;
 
 /**
  * Load the session from the specified filename.
@@ -46,10 +46,9 @@ SR_API int sr_session_load(const char *filename)
 	struct zip *archive;
 	struct zip_file *zf;
 	struct zip_stat zs;
-	struct sr_session *session;
 	struct sr_dev *dev;
 	struct sr_probe *probe;
-	int ret, err, probenum, devcnt, i, j;
+	int ret, probenum, devcnt, i, j;
 	uint64_t tmp_u64, total_probes, enabled_probes, p;
 	char **sections, **keys, *metafile, *val, c;
 	char probename[SR_MAX_PROBENAME_LEN + 1];
@@ -59,9 +58,9 @@ SR_API int sr_session_load(const char *filename)
 		return SR_ERR_ARG;
 	}
 
-	if (!(archive = zip_open(filename, 0, &err))) {
+	if (!(archive = zip_open(filename, 0, &ret))) {
 		sr_dbg("session file: Failed to open session file: zip "
-		       "error %d", err);
+		       "error %d", ret);
 		return SR_ERR;
 	}
 
@@ -98,7 +97,7 @@ SR_API int sr_session_load(const char *filename)
 		return SR_ERR;
 	}
 
-	session = sr_session_new();
+	sr_session_new();
 
 	devcnt = 0;
 	capturefiles = g_ptr_array_new_with_free_func(g_free);
@@ -117,20 +116,20 @@ SR_API int sr_session_load(const char *filename)
 				if (!strcmp(keys[j], "capturefile")) {
 					dev = sr_dev_new(&session_driver, devcnt);
 					if (devcnt == 0)
-						/* first device, init the plugin */
-						dev->plugin->init((char *)filename);
+						/* first device, init the driver */
+						dev->driver->init((char *)filename);
 					sr_session_dev_add(dev);
-					dev->plugin->set_configuration(devcnt, SR_HWCAP_CAPTUREFILE, val);
+					dev->driver->dev_config_set(devcnt, SR_HWCAP_CAPTUREFILE, val);
 					g_ptr_array_add(capturefiles, val);
 				} else if (!strcmp(keys[j], "samplerate")) {
 					sr_parse_sizestring(val, &tmp_u64);
-					dev->plugin->set_configuration(devcnt, SR_HWCAP_SAMPLERATE, &tmp_u64);
+					dev->driver->dev_config_set(devcnt, SR_HWCAP_SAMPLERATE, &tmp_u64);
 				} else if (!strcmp(keys[j], "unitsize")) {
 					tmp_u64 = strtoull(val, NULL, 10);
-					dev->plugin->set_configuration(devcnt, SR_HWCAP_CAPTURE_UNITSIZE, &tmp_u64);
+					dev->driver->dev_config_set(devcnt, SR_HWCAP_CAPTURE_UNITSIZE, &tmp_u64);
 				} else if (!strcmp(keys[j], "total probes")) {
 					total_probes = strtoull(val, NULL, 10);
-					dev->plugin->set_configuration(devcnt, SR_HWCAP_CAPTURE_NUM_PROBES, &total_probes);
+					dev->driver->dev_config_set(devcnt, SR_HWCAP_CAPTURE_NUM_PROBES, &total_probes);
 					for (p = 0; p < total_probes; p++) {
 						snprintf(probename, SR_MAX_PROBENAME_LEN, "%" PRIu64, p);
 						sr_dev_probe_add(dev, probename);
@@ -140,7 +139,7 @@ SR_API int sr_session_load(const char *filename)
 						continue;
 					enabled_probes++;
 					tmp_u64 = strtoul(keys[j]+5, NULL, 10);
-					sr_dev_probe_name(dev, tmp_u64, val);
+					sr_dev_probe_name_set(dev, tmp_u64, val);
 				} else if (!strncmp(keys[j], "trigger", 7)) {
 					probenum = strtoul(keys[j]+7, NULL, 10);
 					sr_dev_trigger_set(dev, probenum, val);
@@ -177,7 +176,7 @@ int sr_session_save(const char *filename)
 	struct sr_datastore *ds;
 	struct zip *zipfile;
 	struct zip_source *versrc, *metasrc, *logicsrc;
-	int bufcnt, devcnt, tmpfile, ret, error, probecnt;
+	int bufcnt, devcnt, tmpfile, ret, probecnt;
 	uint64_t samplerate;
 	char version[1], rawname[16], metafile[32], *buf, *s;
 
@@ -188,7 +187,7 @@ int sr_session_save(const char *filename)
 
 	/* Quietly delete it first, libzip wants replace ops otherwise. */
 	unlink(filename);
-	if (!(zipfile = zip_open(filename, ZIP_CREATE, &error)))
+	if (!(zipfile = zip_open(filename, ZIP_CREATE, &ret)))
 		return SR_ERR;
 
 	/* "version" */
@@ -217,8 +216,8 @@ int sr_session_save(const char *filename)
 		dev = l->data;
 		/* metadata */
 		fprintf(meta, "[device %d]\n", devcnt);
-		if (dev->plugin)
-			fprintf(meta, "driver = %s\n", dev->plugin->name);
+		if (dev->driver)
+			fprintf(meta, "driver = %s\n", dev->driver->name);
 
 		ds = dev->datastore;
 		if (ds) {
@@ -227,8 +226,8 @@ int sr_session_save(const char *filename)
 			fprintf(meta, "unitsize = %d\n", ds->ds_unitsize);
 			fprintf(meta, "total probes = %d\n", g_slist_length(dev->probes));
 			if (sr_dev_has_hwcap(dev, SR_HWCAP_SAMPLERATE)) {
-				samplerate = *((uint64_t *) dev->plugin->get_dev_info(
-						dev->plugin_index, SR_DI_CUR_SAMPLERATE));
+				samplerate = *((uint64_t *) dev->driver->dev_info_get(
+						dev->driver_index, SR_DI_CUR_SAMPLERATE));
 				s = sr_samplerate_string(samplerate);
 				fprintf(meta, "samplerate = %s\n", s);
 				g_free(s);