#include <inttypes.h>
#include <libusb.h>
#include "config.h"
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
#include "fx2lafw.h"
#include "command.h"
static const struct fx2lafw_profile supported_fx2[] = {
+ /*
+ * CWAV USBee DX
+ * XZL Studio DX
+ */
+ { 0x08a9, 0x0015, "CWAV", "USBee DX", NULL,
+ FIRMWARE_DIR "/fx2lafw-cwav-usbeedx.fw",
+ 0 },
/*
* CWAV USBee AX
* EE Electronics ESLA201A
static void abort_acquisition(struct context *ctx)
{
- unsigned int i;
+ int i;
ctx->num_samples = -1;
- for (i = 0; i < ctx->num_transfers; i++) {
+ for (i = ctx->num_transfers - 1; i >= 0; i--) {
if (ctx->transfers[i])
libusb_cancel_transfer(ctx->transfers[i]);
}
2 | LIBUSB_ENDPOINT_IN, buf, size,
receive_transfer, ctx, timeout);
if (libusb_submit_transfer(transfer) != 0) {
- /* TODO: Free them all. */
libusb_free_transfer(transfer);
g_free(buf);
+ abort_acquisition(ctx);
return SR_ERR;
}
ctx->transfers[i] = transfer;
if ((ret = command_start_acquisition (ctx->usb->devhdl,
ctx->cur_samplerate, ctx->sample_wide)) != SR_OK) {
+ abort_acquisition(ctx);
return ret;
}