sr: fx2lafw: Forgot to add (C) line to fx2lafw.h in recent commit.

[libsigrok.git] / session_file.c

diff --git a/session_file.c b/session_file.c
index d11ccebd0a2e9b414f0a5189b042b0babe26bfc1..d58d2f1615634e39958aac730620d5153c301021 100644 (file)
--- a/session_file.c
+++ b/session_file.c
@@ -28,7 +28,7 @@
 #include "sigrok-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.
@@ -48,7 +48,7 @@ SR_API int sr_session_load(const char *filename)
        struct zip_stat zs;
        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];
@@ -58,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;
        }
 
@@ -116,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->dev_config_set(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->dev_config_set(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->dev_config_set(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->dev_config_set(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);
@@ -139,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);
@@ -176,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;
 
@@ -187,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" */
@@ -216,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) {
@@ -226,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->dev_info_get(
-                                               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);