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

sigma: Fix bugs in receive_data callback. 

- Poll data position on Sigma for every iteration.
- Return TRUE when no data ready.
This commit is contained in:
Håvard Espeland 2012-04-22 13:05:10 +02:00
parent 934cde02b8
commit 805919b042
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hardware/asix-sigma/asix-sigma.c
View File

@ -1023,10 +1023,13 @@ static int receive_data(int fd, int revents, void *cb_data)
(void)fd; (void)fd;
(void)revents; (void)revents;
/* Get the current position. */
sigma_read_pos(&ctx->state.stoppos, &ctx->state.triggerpos, ctx);
numchunks = (ctx->state.stoppos + 511) / 512; numchunks = (ctx->state.stoppos + 511) / 512;
if (ctx->state.state == SIGMA_IDLE) if (ctx->state.state == SIGMA_IDLE)
return FALSE; return TRUE;
if (ctx->state.state == SIGMA_CAPTURE) { if (ctx->state.state == SIGMA_CAPTURE) {
/* Check if the timer has expired, or memory is full. */ /* Check if the timer has expired, or memory is full. */
@ -1035,11 +1038,11 @@ static int receive_data(int fd, int revents, void *cb_data)
(tv.tv_usec - ctx->start_tv.tv_usec) / 1000; (tv.tv_usec - ctx->start_tv.tv_usec) / 1000;
if (running_msec < ctx->limit_msec && numchunks < 32767) if (running_msec < ctx->limit_msec && numchunks < 32767)
return FALSE; return TRUE; /* While capturing... */
else {
hw_dev_acquisition_stop(sdi->index, sdi); hw_dev_acquisition_stop(sdi->index, sdi);
return FALSE;
} else if (ctx->state.state == SIGMA_DOWNLOAD) { } else if (ctx->state.state == SIGMA_DOWNLOAD) {
if (ctx->state.chunks_downloaded >= numchunks) { if (ctx->state.chunks_downloaded >= numchunks) {
/* End of samples. */ /* End of samples. */