X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffx2lafw%2Ffx2lafw.c;h=7142a35de7037f9070bc651f0798b1935bf50d76;hb=c9166745f23889e1c5abb010513733c829c00d1b;hp=59ad5e73053fb111805b8e5af43535d842228254;hpb=25f5d66a7752379abe454da0705df4ed15ce6426;p=libsigrok.git

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index 59ad5e73..7142a35d 100644
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -24,12 +24,19 @@
 #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
@@ -662,11 +669,11 @@ static int receive_data(int fd, int revents, void *cb_data)
 
 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]);
 	}