sr: always use uint64_t for samplerate

[libsigrok.git] / hardware / fx2lafw / fx2lafw.c

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index 28866133962ec6d3eb5e3b7883d34b770068e95f..334a11094d8239d25db86050e4241d35e5b46d64 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -24,8 +24,8 @@
 #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"
 
@@ -662,11 +662,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]);
        }
@@ -918,6 +918,10 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
        if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
                return SR_ERR;
        ctx = sdi->priv;
+
+       if (ctx->submitted_transfers != 0)
+               return SR_ERR;
+
        ctx->session_dev_id = cb_data;
        ctx->num_samples = 0;
        ctx->empty_transfer_count = 0;
@@ -942,9 +946,9 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
                                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;
@@ -972,6 +976,7 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 
        if ((ret = command_start_acquisition (ctx->usb->devhdl,
                ctx->cur_samplerate, ctx->sample_wide)) != SR_OK) {
+               abort_acquisition(ctx);
                return ret;
        }