*
* @param fd TODO.
* @param revents TODO.
- * @param session_data TODO.
+ * @param cb_data TODO.
*
* @return TODO.
*/
-static int feed_chunk(int fd, int revents, void *session_data)
+static int receive_data(int fd, int revents, void *cb_data)
{
struct sr_dev_inst *sdi;
struct session_vdev *vdev;
logic.unitsize = vdev->unitsize;
logic.data = buf;
vdev->bytes_read += ret;
- sr_session_send(session_data, &packet);
+ sr_session_send(cb_data, &packet);
} else {
/* done with this capture file */
zip_fclose(vdev->capfile);
if (!got_data) {
packet.type = SR_DF_END;
- sr_session_send(session_data, &packet);
+ sr_session_send(cb_data, &packet);
}
return TRUE;
/**
* TODO.
- *
*/
static int hw_cleanup(void)
{
return SR_OK;
}
-static int hw_dev_acquisition_start(int dev_index, void *session_dev_id)
+static int hw_dev_acquisition_start(int dev_index, void *cb_data)
{
struct zip_stat zs;
struct session_vdev *vdev;
struct sr_datafeed_header *header;
struct sr_datafeed_packet *packet;
- int err;
-
- /* Avoid compiler warnings. */
- (void)session_dev_id;
+ struct sr_datafeed_meta_logic meta;
+ int ret;
if (!(vdev = get_vdev_by_index(dev_index)))
return SR_ERR;
sr_info("session_driver: opening archive %s file %s", sessionfile,
vdev->capturefile);
- if (!(vdev->archive = zip_open(sessionfile, 0, &err))) {
+ if (!(vdev->archive = zip_open(sessionfile, 0, &ret))) {
sr_err("session driver: Failed to open session file '%s': "
- "zip error %d\n", sessionfile, err);
+ "zip error %d\n", sessionfile, ret);
return SR_ERR;
}
}
/* freewheeling source */
- sr_session_source_add(-1, 0, 0, feed_chunk, session_dev_id);
+ sr_session_source_add(-1, 0, 0, receive_data, cb_data);
if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) {
sr_err("session driver: %s: packet malloc failed", __func__);
packet->payload = (unsigned char *)header;
header->feed_version = 1;
gettimeofday(&header->starttime, NULL);
- header->samplerate = vdev->samplerate;
- header->num_logic_probes = vdev->num_probes;
- sr_session_send(session_dev_id, packet);
+ sr_session_send(cb_data, packet);
+
+ /* Send metadata about the SR_DF_LOGIC packets to come. */
+ packet->type = SR_DF_META_LOGIC;
+ packet->payload = &meta;
+ meta.samplerate = vdev->samplerate;
+ meta.num_probes = vdev->num_probes;
+ sr_session_send(cb_data, packet);
+
g_free(header);
g_free(packet);