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

saleae-logic-pro: Detect and abort on capture errors 

The HW simply stops sending data on overflows, so if we receive no data
in one second, we abort the acquisition. We also need to allocate more
buffers to support higher sample rates.
This commit is contained in:
Jan Luebbe 2017-07-16 19:28:58 +02:00
parent da39089014
commit f2b8a31be5
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/hardware/saleae-logic-pro/api.c
View File

@ -22,9 +22,9 @@
#include <string.h>
#include "protocol.h"
#define BUF_COUNT 8
#define BUF_COUNT 512
#define BUF_SIZE (16 * 1024)
#define BUF_TIMEOUT (1000 * 1000)
#define BUF_TIMEOUT 1000
SR_PRIV struct sr_dev_driver saleae_logic_pro_driver_info;
@ -395,6 +395,8 @@ static void dev_acquisition_abort(const struct sr_dev_inst *sdi)
}
}
static int dev_acquisition_stop(struct sr_dev_inst *sdi);
static int dev_acquisition_handle(int fd, int revents, void *cb_data)
{
struct sr_dev_inst *sdi = cb_data;
@ -402,10 +404,13 @@ static int dev_acquisition_handle(int fd, int revents, void *cb_data)
struct timeval tv = ALL_ZERO;
(void)fd;
(void)revents;
libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
/* Handle timeout */
if (!revents)
dev_acquisition_stop(sdi);
return TRUE;
}
@ -433,7 +438,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
transfer = libusb_alloc_transfer(0);
libusb_fill_bulk_transfer(transfer, usb->devhdl,
2 | LIBUSB_ENDPOINT_IN, buf, BUF_SIZE,
saleae_logic_pro_receive_data, (void *)sdi, BUF_TIMEOUT);
saleae_logic_pro_receive_data, (void *)sdi, 0);
if ((ret = libusb_submit_transfer(transfer)) != 0) {
sr_err("Failed to submit transfer: %s.",
libusb_error_name(ret));