#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"
{ 0x08a9, 0x0014, "CWAV", "USBee AX", NULL,
FIRMWARE_DIR "/fx2lafw-cwav-usbeeax.fw",
0 },
+ /*
+ * CWAV USBee DX
+ * XZL-Studio DX
+ */
+ { 0x08a9, 0x0015, "CWAV", "USBee DX", NULL,
+ FIRMWARE_DIR "/fx2lafw-cwav-usbeedx.fw",
+ DEV_CAPS_16BIT },
/*
* CWAV USBee SX
* API callbacks
*/
-static int hw_init(const char *devinfo)
+static int hw_init(void)
+{
+
+ if (libusb_init(&usb_context) != 0) {
+ sr_warn("fx2lafw: Failed to initialize libusb.");
+ return SR_ERR;
+ }
+
+ return SR_OK;
+}
+
+static int hw_scan(void)
{
struct sr_dev_inst *sdi;
struct libusb_device_descriptor des;
const struct fx2lafw_profile *prof;
struct context *ctx;
libusb_device **devlist;
- int ret;
- int devcnt = 0;
- int i, j;
-
- /* Avoid compiler warnings. */
- (void)devinfo;
-
- if (libusb_init(&usb_context) != 0) {
- sr_warn("fx2lafw: Failed to initialize libusb.");
- return 0;
- }
+ int devcnt, ret, i, j;
/* Find all fx2lafw compatible devices and upload firmware to them. */
+ devcnt = 0;
libusb_get_device_list(usb_context, &devlist);
for (i = 0; devlist[i]; i++) {
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;
}
.api_version = 1,
.init = hw_init,
.cleanup = hw_cleanup,
+ .scan = hw_scan,
.dev_open = hw_dev_open,
.dev_close = hw_dev_close,
.dev_info_get = hw_dev_info_get,