#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
char *capturefile;
struct zip *archive;
struct zip_file *capfile;
+ int bytes_read;
uint64_t samplerate;
int unitsize;
int num_probes;
0,
};
-
static struct session_vdevice *get_vdevice_by_index(int device_index)
{
struct sr_device_instance *sdi;
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;
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 */
sr_session_source_remove(-1);
g_free(sessionfile);
-
}
static int hw_opendev(int device_index)
/* Avoid compiler warnings. */
(void)device_index;
- if (devices)
+ if (sr_device_list() != NULL)
return SR_OK;
else
return SR_ERR;
static int *hw_get_capabilities(void)
{
-
return capabilities;
}
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);
return SR_OK;
}
+/* Not static, it's used elsewhere (via 'extern'). */
struct sr_device_plugin session_driver = {
"session",
"Session-emulating driver",