device: Change some functions to return int.

[libsigrok.git] / session_driver.c

diff --git a/session_driver.c b/session_driver.c
index b7cd5f14916816064bfa05384ed31bed04bb63a2..e59f49d165c37cfd9d4ade076e869a40c618974a 100644 (file)
--- a/session_driver.c
+++ b/session_driver.c
@@ -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;
@@ -66,13 +67,14 @@ 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;
 
-       /* avoid compiler warning */
-       fd = fd;
-       revents = revents;
+       /* Avoid compiler warnings. */
+       (void)fd;
+       (void)revents;
 
        sr_dbg("session_driver: feed chunk");
 
@@ -94,12 +96,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 */
@@ -183,9 +187,8 @@ static void *hw_get_device_info(int device_index, int device_info_id)
 
 static int hw_get_status(int device_index)
 {
-
-       /* avoid compiler warning */
-       device_index = device_index;
+       /* Avoid compiler warnings. */
+       (void)device_index;
 
        if (devices)
                return SR_OK;
@@ -238,8 +241,8 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        struct sr_datafeed_packet *packet;
        int err;
 
-       /* avoid compiler warning */
-       session_device_id = session_device_id;
+       /* Avoid compiler warnings. */
+       (void)session_device_id;
 
        if (!(vdevice = get_vdevice_by_index(device_index)))
                return SR_ERR;
@@ -283,7 +286,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        packet->payload = (unsigned char *)header;
        header->feed_version = 1;
        gettimeofday(&header->starttime, NULL);
-       header->samplerate = 0;
+       header->samplerate = vdevice->samplerate;
        header->num_logic_probes = vdevice->num_probes;
        header->num_analog_probes = 0;
        sr_session_bus(session_device_id, packet);