session_driver: Don't open-code std_dev_clear().

[libsigrok.git] / src / session_driver.c

diff --git a/src/session_driver.c b/src/session_driver.c
index 285fa624d326cd47818ad348811f676aa272e7c3..97d75413b9bcd8b360f043f51ce7c3c07d38044e 100644 (file)
--- a/src/session_driver.c
+++ b/src/session_driver.c
@@ -124,7 +124,17 @@ static gboolean stream_session_data(struct sr_dev_inst *sdi)
                        } else {
                                /* We got all the chunks, finish up. */
                                g_free(vdev->capturefile);
-                               vdev->capturefile = NULL;
+
+                               /* If the file has logic channels, the initial value for
+                                * capturefile is set by stream_session_data() - however only
+                                * once. In order to not mess this mechanism up, we simulate
+                                * this here if needed. For purely analog files, capturefile
+                                * is not set.
+                                */
+                               if (vdev->num_logic_channels)
+                                       vdev->capturefile = g_strdup("logic-1");
+                               else
+                                       vdev->capturefile = NULL;
                                return FALSE;
                        }
                }
@@ -213,20 +223,6 @@ static int receive_data(int fd, int revents, void *cb_data)
 
 /* driver callbacks */
 
-static int dev_clear(const struct sr_dev_driver *di)
-{
-       struct drv_context *drvc;
-       GSList *l;
-
-       drvc = di->context;
-       for (l = drvc->instances; l; l = l->next)
-               sr_dev_inst_free(l->data);
-       g_slist_free(drvc->instances);
-       drvc->instances = NULL;
-
-       return SR_OK;
-}
-
 static int dev_open(struct sr_dev_inst *sdi)
 {
        struct sr_dev_driver *di;
@@ -392,10 +388,10 @@ SR_PRIV struct sr_dev_driver session_driver = {
        .longname = "Session-emulating driver",
        .api_version = 1,
        .init = std_init,
-       .cleanup = dev_clear,
+       .cleanup = std_dev_clear,
        .scan = NULL,
        .dev_list = NULL,
-       .dev_clear = dev_clear,
+       .dev_clear = std_dev_clear,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,