BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

session_driver: Process analog chunks into analog packets.

This commit is contained in:
Martin Ling 2015-12-28 22:29:25 +00:00 committed by Uwe Hermann
parent 906921bad2
commit 2dc4081540
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/session_driver.c
View File

@ -47,6 +47,7 @@ struct session_vdev {
int num_channels; int num_channels;
int num_analog_channels; int num_analog_channels;
int cur_analog_channel; int cur_analog_channel;
GArray *analog_channels;
int cur_chunk; int cur_chunk;
gboolean finished; gboolean finished;
}; };
@ -65,6 +66,7 @@ static gboolean stream_session_data(struct sr_dev_inst *sdi)
struct session_vdev *vdev; struct session_vdev *vdev;
struct sr_datafeed_packet packet; struct sr_datafeed_packet packet;
struct sr_datafeed_logic logic; struct sr_datafeed_logic logic;
struct sr_datafeed_analog_old analog;
struct zip_stat zs; struct zip_stat zs;
int ret, got_data; int ret, got_data;
char capturefile[16]; char capturefile[16];
@ -127,15 +129,28 @@ static gboolean stream_session_data(struct sr_dev_inst *sdi)
ret = zip_fread(vdev->capfile, buf, ret = zip_fread(vdev->capfile, buf,
CHUNKSIZE / vdev->unitsize * vdev->unitsize); CHUNKSIZE / vdev->unitsize * vdev->unitsize);
if (ret > 0) { if (ret > 0) {
if (ret % vdev->unitsize != 0)
sr_warn("Read size %d not a multiple of the"
" unit size %d.", ret, vdev->unitsize);
got_data = TRUE; got_data = TRUE;
packet.type = SR_DF_LOGIC; if (vdev->cur_analog_channel != 0) {
packet.payload = &logic; packet.type = SR_DF_ANALOG_OLD;
logic.length = ret; packet.payload = &analog;
logic.unitsize = vdev->unitsize; analog.channels = g_slist_prepend(NULL,
logic.data = buf; g_array_index(vdev->analog_channels,
struct sr_channel *, vdev->cur_analog_channel - 1));
analog.num_samples = ret / sizeof(float);
analog.mq = SR_MQ_VOLTAGE;
analog.unit = SR_UNIT_VOLT;
analog.mqflags = SR_MQFLAG_DC;
analog.data = (float *) buf;
} else {
if (ret % vdev->unitsize != 0)
sr_warn("Read size %d not a multiple of the"
" unit size %d.", ret, vdev->unitsize);
packet.type = SR_DF_LOGIC;
packet.payload = &logic;
logic.length = ret;
logic.unitsize = vdev->unitsize;
logic.data = buf;
}
vdev->bytes_read += ret; vdev->bytes_read += ret;
sr_session_send(sdi, &packet); sr_session_send(sdi, &packet);
} else { } else {
@ -321,12 +336,21 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
{ {
struct session_vdev *vdev; struct session_vdev *vdev;
int ret; int ret;
GSList *l;
struct sr_channel *ch;
(void)cb_data; (void)cb_data;
vdev = sdi->priv; vdev = sdi->priv;
vdev->bytes_read = 0; vdev->bytes_read = 0;
vdev->cur_analog_channel = 0; vdev->cur_analog_channel = 0;
vdev->analog_channels = g_array_sized_new(FALSE, FALSE,
sizeof(struct sr_channel *), vdev->num_analog_channels);
for (l = sdi->channels; l; l = l->next) {
ch = l->data;
if (ch->type == SR_CHANNEL_ANALOG)
g_array_append_val(vdev->analog_channels, ch);
}
vdev->cur_chunk = 0; vdev->cur_chunk = 0;
vdev->finished = FALSE; vdev->finished = FALSE;