No need to check return value of libusb_get_device_descriptor().

[libsigrok.git] / src / session_file.c

diff --git a/src/session_file.c b/src/session_file.c
index 8b4f60b592dfcc893600aa80f816a914710765a1..9def98d732efdcb1aef743345627bc6dfd9d4481 100644 (file)
--- a/src/session_file.c
+++ b/src/session_file.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -26,8 +27,7 @@
 #include <errno.h>
 #include <glib.h>
 #include <glib/gstdio.h>
-#include "config.h" /* Needed for PACKAGE_VERSION and others. */
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
@@ -49,7 +49,6 @@
 extern SR_PRIV struct sr_dev_driver session_driver;
 static int session_driver_initialized = 0;
 
-
 /** @private */
 SR_PRIV int sr_sessionfile_check(const char *filename)
 {
@@ -64,7 +63,7 @@ SR_PRIV int sr_sessionfile_check(const char *filename)
                return SR_ERR_ARG;
 
        if (stat(filename, &st) == -1) {
-               sr_err("Couldn't stat %s: %s", filename, strerror(errno));
+               sr_err("Couldn't stat %s: %s", filename, g_strerror(errno));
                return SR_ERR;
        }
 
@@ -106,6 +105,7 @@ SR_PRIV int sr_sessionfile_check(const char *filename)
 /**
  * Load the session from the specified filename.
  *
+ * @param ctx The context in which to load the session.
  * @param filename The name of the session file to load.
  * @param session The session to load the file into.
  *
@@ -114,7 +114,8 @@ SR_PRIV int sr_sessionfile_check(const char *filename)
  * @retval SR_ERR_DATA Malformed session file
  * @retval SR_ERR This is not a session file
  */
-SR_API int sr_session_load(const char *filename, struct sr_session **session)
+SR_API int sr_session_load(struct sr_context *ctx, const char *filename,
+               struct sr_session **session)
 {
        GKeyFile *kf;
        GPtrArray *capturefiles;
@@ -124,7 +125,7 @@ SR_API int sr_session_load(const char *filename, struct sr_session **session)
        struct sr_dev_inst *sdi;
        struct sr_channel *ch;
        int ret, i, j;
-       uint64_t tmp_u64, total_channels, enabled_channels, p;
+       uint64_t tmp_u64, total_channels, p;
        char **sections, **keys, *metafile, *val;
        char channelname[SR_MAX_CHANNELNAME_LEN + 1];
 
@@ -152,7 +153,7 @@ SR_API int sr_session_load(const char *filename, struct sr_session **session)
                return SR_ERR;
        }
 
-       if ((ret = sr_session_new(session)) != SR_OK)
+       if ((ret = sr_session_new(ctx, session)) != SR_OK)
                return ret;
 
        ret = SR_OK;
@@ -165,7 +166,6 @@ SR_API int sr_session_load(const char *filename, struct sr_session **session)
                if (!strncmp(sections[i], "device ", 7)) {
                        /* device section */
                        sdi = NULL;
-                       enabled_channels = total_channels = 0;
                        keys = g_key_file_get_keys(kf, sections[i], NULL, NULL);
                        for (j = 0; keys[j]; j++) {
                                val = g_key_file_get_string(kf, sections[i], keys[j], NULL);
@@ -176,7 +176,7 @@ SR_API int sr_session_load(const char *filename, struct sr_session **session)
                                        if (!session_driver_initialized) {
                                                /* first device, init the driver */
                                                session_driver_initialized = 1;
-                                               sdi->driver->init(NULL);
+                                               sdi->driver->init(sdi->driver, NULL);
                                        }
                                        sr_dev_open(sdi);
                                        sr_session_dev_add(*session, sdi);
@@ -213,26 +213,22 @@ SR_API int sr_session_load(const char *filename, struct sr_session **session)
                                                        g_variant_new_uint64(total_channels), sdi, NULL);
                                        for (p = 0; p < total_channels; p++) {
                                                snprintf(channelname, SR_MAX_CHANNELNAME_LEN, "%" PRIu64, p);
-                                               ch = sr_channel_new(p, SR_CHANNEL_LOGIC, TRUE,
+                                               sr_channel_new(sdi, p, SR_CHANNEL_LOGIC, FALSE,
                                                                channelname);
-                                               sdi->channels = g_slist_append(sdi->channels, ch);
                                        }
                                } else if (!strncmp(keys[j], "probe", 5)) {
                                        if (!sdi) {
                                                ret = SR_ERR_DATA;
                                                break;
                                        }
-                                       enabled_channels++;
-                                       tmp_u64 = strtoul(keys[j]+5, NULL, 10);
+                                       tmp_u64 = strtoul(keys[j]+5, NULL, 10) - 1;
+                                       ch = g_slist_nth_data(sdi->channels, tmp_u64);
                                        /* sr_session_save() */
-                                       sr_dev_channel_name_set(sdi, tmp_u64 - 1, val);
+                                       sr_dev_channel_name_set(ch, val);
+                                       sr_dev_channel_enable(ch, TRUE);
                                }
                        }
                        g_strfreev(keys);
-                       /* Disable channels not specifically listed. */
-                       if (total_channels)
-                               for (p = enabled_channels; p < total_channels; p++)
-                                       sr_dev_channel_enable(sdi, p, FALSE);
                }
        }
        g_strfreev(sections);
@@ -355,7 +351,7 @@ SR_API int sr_session_save_init(struct sr_session *session,
        close(tmpfile);
        meta = g_fopen(metafile, "wb");
        fprintf(meta, "[global]\n");
-       fprintf(meta, "sigrok version = %s\n", PACKAGE_VERSION);
+       fprintf(meta, "sigrok version = %s\n", SR_PACKAGE_VERSION_STRING);
 
        /* metadata */
        fprintf(meta, "[device 1]\n");
@@ -469,7 +465,7 @@ SR_API int sr_session_append(struct sr_session *session, const char *filename,
                if ((tmpfile = g_mkstemp(tmpname)) == -1)
                        return SR_ERR;
                if (write(tmpfile, metafile, len) < 0) {
-                       sr_dbg("Failed to create new metadata: %s", strerror(errno));
+                       sr_dbg("Failed to create new metadata: %s", g_strerror(errno));
                        g_free(metafile);
                        unlink(tmpname);
                        return SR_ERR;