libsigrok: Fix #includes.

[libsigrok.git] / session_driver.c

diff --git a/session_driver.c b/session_driver.c
index fd5b11fc55cab186aa6e6d3ccd034811e2e4c965..fe9765edee82039ed397fec330dae94963f57281 100644 (file)
--- a/session_driver.c
+++ b/session_driver.c
@@ -23,8 +23,8 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <zip.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 /* size of payloads sent across the session bus */
 #define CHUNKSIZE 4096
@@ -33,6 +33,7 @@ struct session_vdevice {
        char *capturefile;
        struct zip *archive;
        struct zip_file *capfile;
+       int bytes_read;
        uint64_t samplerate;
        int unitsize;
        int num_probes;
@@ -46,7 +47,6 @@ static int capabilities[] = {
        0,
 };
 
-
 static struct session_vdevice *get_vdevice_by_index(int device_index)
 {
        struct sr_device_instance *sdi;
@@ -66,6 +66,7 @@ static int feed_chunk(int fd, int revents, void *session_data)
        struct session_vdevice *vdevice;
        struct sr_datafeed_packet packet;
        struct sr_datafeed_logic logic;
+       uint64_t sample_period_ps;
        GSList *l;
        void *buf;
        int ret, got_data;
@@ -94,12 +95,14 @@ static int feed_chunk(int fd, int revents, void *session_data)
                if (ret > 0) {
                        got_data = TRUE;
                        packet.type = SR_DF_LOGIC;
-                       packet.timeoffset = 0;
-                       packet.duration = 0;
+                       sample_period_ps = 1000000000000 / vdevice->samplerate;
+                       packet.timeoffset = sample_period_ps * (vdevice->bytes_read / vdevice->unitsize);
+                       packet.duration = sample_period_ps * (ret / vdevice->unitsize);
                        packet.payload = &logic;
                        logic.length = ret;
                        logic.unitsize = vdevice->unitsize;
                        logic.data = buf;
+                       vdevice->bytes_read += ret;
                        sr_session_bus(session_data, &packet);
                } else {
                        /* done with this capture file */
@@ -143,7 +146,6 @@ static void hw_cleanup(void)
        sr_session_source_remove(-1);
 
        g_free(sessionfile);
-
 }
 
 static int hw_opendev(int device_index)
@@ -186,7 +188,7 @@ static int hw_get_status(int device_index)
        /* Avoid compiler warnings. */
        (void)device_index;
 
-       if (devices)
+       if (sr_device_list() != NULL)
                return SR_OK;
        else
                return SR_ERR;
@@ -194,7 +196,6 @@ static int hw_get_status(int device_index)
 
 static int *hw_get_capabilities(void)
 {
-
        return capabilities;
 }
 
@@ -292,6 +293,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        return SR_OK;
 }
 
+/* Not static, it's used elsewhere (via 'extern'). */
 struct sr_device_plugin session_driver = {
        "session",
        "Session-emulating driver",