configure: Add --enable-bindings switch.

[libsigrok.git] / session_driver.c

diff --git a/session_driver.c b/session_driver.c
index a7ecce6b80674e544a0516563ce164d7a6c9160c..fd86ced1655a39298e190b4027766501a0dc991d 100644 (file)
--- a/session_driver.c
+++ b/session_driver.c
@@ -41,7 +41,7 @@ struct session_vdev {
        int bytes_read;
        uint64_t samplerate;
        int unitsize;
-       int num_probes;
+       int num_channels;
        int cur_chunk;
        gboolean finished;
 };
@@ -53,6 +53,8 @@ static const int hwcaps[] = {
        SR_CONF_SAMPLERATE,
 };
 
+extern struct sr_session *sr_current_session;
+
 static int receive_data(int fd, int revents, void *cb_data)
 {
        struct sr_dev_inst *sdi;
@@ -115,7 +117,6 @@ static int receive_data(int fd, int revents, void *cb_data)
                                        sr_dbg("Opened %s.", capturefile);
                                } else {
                                        /* We got all the chunks, finish up. */
-                                       g_free(vdev->capturefile);
                                        vdev->finished = TRUE;
                                        continue;
                                }
@@ -127,8 +128,12 @@ static int receive_data(int fd, int revents, void *cb_data)
                        return FALSE;
                }
 
-               ret = zip_fread(vdev->capfile, buf, CHUNKSIZE);
+               ret = zip_fread(vdev->capfile, buf,
+                               CHUNKSIZE / vdev->unitsize * vdev->unitsize);
                if (ret > 0) {
+                       if (ret % vdev->unitsize != 0)
+                               sr_warn("Read size %d not a multiple of the"
+                                       " unit size %d.", ret, vdev->unitsize);
                        got_data = TRUE;
                        packet.type = SR_DF_LOGIC;
                        packet.payload = &logic;
@@ -143,7 +148,6 @@ static int receive_data(int fd, int revents, void *cb_data)
                        vdev->capfile = NULL;
                        if (vdev->cur_chunk == 0) {
                                /* It was the only file. */
-                               g_free(vdev->capturefile);
                                vdev->finished = TRUE;
                        } else {
                                /* There might be more chunks, so don't fall through
@@ -158,7 +162,7 @@ static int receive_data(int fd, int revents, void *cb_data)
        if (!got_data) {
                packet.type = SR_DF_END;
                sr_session_send(cb_data, &packet);
-               sr_session_source_remove(-1);
+               sr_session_source_remove(sr_current_session, -1);
        }
 
        return TRUE;
@@ -173,7 +177,7 @@ static int init(struct sr_context *sr_ctx)
        return SR_OK;
 }
 
-static int cleanup(void)
+static int dev_clear(void)
 {
        GSList *l;
 
@@ -198,6 +202,10 @@ static int dev_open(struct sr_dev_inst *sdi)
 
 static int dev_close(struct sr_dev_inst *sdi)
 {
+       const struct session_vdev *const vdev = sdi->priv;
+       g_free(vdev->sessionfile);
+       g_free(vdev->capturefile);
+
        g_free(sdi->priv);
        sdi->priv = NULL;
 
@@ -205,11 +213,11 @@ static int dev_close(struct sr_dev_inst *sdi)
 }
 
 static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_probe_group *probe_group)
+               const struct sr_channel_group *cg)
 {
        struct session_vdev *vdev;
 
-       (void)probe_group;
+       (void)cg;
 
        switch (id) {
        case SR_CONF_SAMPLERATE:
@@ -227,11 +235,11 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
 }
 
 static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
-               const struct sr_probe_group *probe_group)
+               const struct sr_channel_group *cg)
 {
        struct session_vdev *vdev;
 
-       (void)probe_group;
+       (void)cg;
 
        vdev = sdi->priv;
 
@@ -241,18 +249,20 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
                sr_info("Setting samplerate to %" PRIu64 ".", vdev->samplerate);
                break;
        case SR_CONF_SESSIONFILE:
+               g_free(vdev->sessionfile);
                vdev->sessionfile = g_strdup(g_variant_get_string(data, NULL));
                sr_info("Setting sessionfile to '%s'.", vdev->sessionfile);
                break;
        case SR_CONF_CAPTUREFILE:
+               g_free(vdev->capturefile);
                vdev->capturefile = g_strdup(g_variant_get_string(data, NULL));
                sr_info("Setting capturefile to '%s'.", vdev->capturefile);
                break;
        case SR_CONF_CAPTURE_UNITSIZE:
                vdev->unitsize = g_variant_get_uint64(data);
                break;
-       case SR_CONF_NUM_LOGIC_PROBES:
-               vdev->num_probes = g_variant_get_uint64(data);
+       case SR_CONF_NUM_LOGIC_CHANNELS:
+               vdev->num_channels = g_variant_get_uint64(data);
                break;
        default:
                return SR_ERR_NA;
@@ -262,10 +272,10 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
 }
 
 static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_probe_group *probe_group)
+               const struct sr_channel_group *cg)
 {
        (void)sdi;
-       (void)probe_group;
+       (void)cg;
 
        switch (key) {
        case SR_CONF_DEVICE_OPTIONS:
@@ -286,6 +296,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
        vdev = sdi->priv;
 
+       vdev->bytes_read = 0;
+       vdev->cur_chunk = 0;
+       vdev->finished = FALSE;
+
        sr_info("Opening archive %s file %s", vdev->sessionfile,
                vdev->capturefile);
 
@@ -299,7 +313,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        std_session_send_df_header(cb_data, LOG_PREFIX);
 
        /* freewheeling source */
-       sr_session_source_add(-1, 0, 0, receive_data, cb_data);
+       sr_session_source_add(sr_current_session, -1, 0, 0, receive_data, cb_data);
 
        return SR_OK;
 }
@@ -310,10 +324,10 @@ SR_PRIV struct sr_dev_driver session_driver = {
        .longname = "Session-emulating driver",
        .api_version = 1,
        .init = init,
-       .cleanup = cleanup,
+       .cleanup = dev_clear,
        .scan = NULL,
        .dev_list = NULL,
-       .dev_clear = NULL,
+       .dev_clear = dev_clear,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,