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

ols: Don't reduce sample count just because it's not a multiple of 4.

This commit is contained in:
Bert Vermeulen 2014-01-23 01:09:16 +01:00
parent 54da58ca9b
commit 32f09bfd9e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hardware/openbench-logic-sniffer/api.c
View File

@ -422,7 +422,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
struct sr_serial_dev_inst *serial; struct sr_serial_dev_inst *serial;
uint32_t trigger_config[4]; uint32_t trigger_config[4];
uint32_t data; uint32_t data;
uint16_t readcount, delaycount; uint16_t samplecount, readcount, delaycount;
uint8_t changrp_mask; uint8_t changrp_mask;
int num_channels; int num_channels;
int i; int i;
@ -456,7 +456,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
* Limit readcount to prevent reading past the end of the hardware * Limit readcount to prevent reading past the end of the hardware
* buffer. * buffer.
*/ */
readcount = MIN(devc->max_samples / num_channels, devc->limit_samples) / 4; samplecount = MIN(devc->max_samples / num_channels, devc->limit_samples);
readcount = samplecount / 4;
if (samplecount % 4)
readcount++;
memset(trigger_config, 0, 16); memset(trigger_config, 0, 16);
trigger_config[devc->num_stages] |= 0x08; trigger_config[devc->num_stages] |= 0x08;