/*
* This file is part of the sigrok project.
*
- * Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <fcntl.h>
#include <unistd.h>
#include <sys/time.h>
-#include "sigrok.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
#define CHUNKSIZE (512 * 1024)
#define DEFAULT_NUM_PROBES 8
}
/* Create a virtual device. */
- in->vdevice = sr_dev_new(NULL, 0);
+ in->vdev = sr_dev_new(NULL, 0);
for (i = 0; i < num_probes; i++) {
snprintf(name, SR_MAX_PROBENAME_LEN, "%d", i);
/* TODO: Check return value. */
- sr_dev_probe_add(in->vdevice, name);
+ sr_dev_probe_add(in->vdev, name);
}
return SR_OK;
{
struct sr_datafeed_header header;
struct sr_datafeed_packet packet;
+ struct sr_datafeed_meta_logic meta;
struct sr_datafeed_logic logic;
unsigned char buffer[CHUNKSIZE];
int fd, size, num_probes;
if ((fd = open(filename, O_RDONLY)) == -1)
return SR_ERR;
- num_probes = g_slist_length(in->vdevice->probes);
+ num_probes = g_slist_length(in->vdev->probes);
/* send header */
header.feed_version = 1;
- header.num_logic_probes = num_probes;
- header.samplerate = 0;
gettimeofday(&header.starttime, NULL);
packet.type = SR_DF_HEADER;
packet.payload = &header;
- sr_session_bus(in->vdevice, &packet);
+ sr_session_send(in->vdev, &packet);
+
+ /* Send metadata about the SR_DF_LOGIC packets to come. */
+ packet.type = SR_DF_META_LOGIC;
+ packet.payload = &meta;
+ meta.samplerate = 0;
+ meta.num_probes = num_probes;
+ sr_session_send(in->vdev, &packet);
/* chop up the input file into chunks and feed it into the session bus */
packet.type = SR_DF_LOGIC;
logic.data = buffer;
while ((size = read(fd, buffer, CHUNKSIZE)) > 0) {
logic.length = size;
- sr_session_bus(in->vdevice, &packet);
+ sr_session_send(in->vdev, &packet);
}
close(fd);
/* end of stream */
packet.type = SR_DF_END;
- sr_session_bus(in->vdevice, &packet);
+ sr_session_send(in->vdev, &packet);
return SR_OK;
}