char *capturefile;
struct zip *archive;
struct zip_file *capfile;
+ int bytes_read;
uint64_t samplerate;
int unitsize;
int num_probes;
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");
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 */
}
/* driver callbacks */
+static void hw_cleanup(void);
static int hw_init(const char *deviceinfo)
{
+ hw_cleanup();
sessionfile = g_strdup(deviceinfo);
for (l = device_instances; l; l = l->next)
sr_device_instance_free(l->data);
+ g_slist_free(device_instances);
+ device_instances = NULL;
+
+ sr_session_source_remove(-1);
+
g_free(sessionfile);
}
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;
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;
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);