]> sigrok.org Git - libsigrok.git/blobdiff - hardware/fx2lafw/fx2lafw.c
sr: fx2lafw: Add basic support for USBee DX and clones
[libsigrok.git] / hardware / fx2lafw / fx2lafw.c
index 3efcdb434bff292cba0fa390d2727ab6ca95b5fb..7142a35de7037f9070bc651f0798b1935bf50d76 100644 (file)
@@ -1,6 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
  * This program is free software: you can redistribute it and/or modify
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdbool.h>
+#include <string.h>
 #include <inttypes.h>
-#include <glib.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
+        * ARMFLY AX-Pro
+        */
+       { 0x08a9, 0x0014, "CWAV", "USBee AX", NULL,
+               FIRMWARE_DIR "/fx2lafw-cwav-usbeeax.fw",
+               0 },
+
+       /*
+        * CWAV USBee SX
+        */
+       { 0x08a9, 0x0009, "CWAV", "USBee SX", NULL,
+               FIRMWARE_DIR "/fx2lafw-cwav-usbeesx.fw",
+               0 },
 
-static struct fx2lafw_profile supported_fx2[] = {
-       /* USBee AX */
-       { 0x08a9, 0x0014, "CWAV", "USBee AX", NULL, 8 },
-       { 0, 0, 0, 0, 0, 0 }
+       /*
+        * Saleae Logic
+        * EE Electronics ESLA100
+        * Robomotic MiniLogic
+        * Robomotic BugLogic 3
+        */
+       { 0x0925, 0x3881, "Saleae", "Logic", NULL,
+               FIRMWARE_DIR "/fx2lafw-saleae-logic.fw",
+               0 },
+
+       /*
+        * Default Cypress FX2 without EEPROM, e.g.:
+        * Lcsoft Mini Board
+        * Braintechnology USB Interface V2.x
+        */
+       { 0x04B4, 0x8613, "Cypress", "FX2", NULL,
+               FIRMWARE_DIR "/fx2lafw-cypress-fx2.fw",
+               DEV_CAPS_16BIT },
+
+       /*
+        * Braintechnology USB-LPS
+        */
+       { 0x16d0, 0x0498, "Braintechnology", "USB-LPS", NULL,
+               FIRMWARE_DIR "/fx2lafw-braintechnology-usb-lps.fw",
+               DEV_CAPS_16BIT },
+
+       { 0, 0, 0, 0, 0, 0, 0 }
 };
 
-static int fx2lafw_capabilities[] = {
+static const int hwcaps[] = {
        SR_HWCAP_LOGIC_ANALYZER,
        SR_HWCAP_SAMPLERATE,
 
        /* These are really implemented in the driver, not the hardware. */
        SR_HWCAP_LIMIT_SAMPLES,
        SR_HWCAP_CONTINUOUS,
-       0
+       0,
 };
 
-static const char *fx2lafw_probe_names[] = {
-       "D0",
-       "D1",
-       "D2",
-       "D3",
-       "D4",
-       "D5",
-       "D6",
-       "D7",
-       NULL
+/*
+ * TODO: Different probe_names[] for each supported device.
+ */
+static const char *probe_names[] = {
+       "0",
+       "1",
+       "2",
+       "3",
+       "4",
+       "5",
+       "6",
+       "7",
+       "8",
+       "9",
+       "10",
+       "11",
+       "12",
+       "13",
+       "14",
+       "15",
+       NULL,
 };
 
-static uint64_t fx2lafw_supported_samplerates[] = {
+static const uint64_t supported_samplerates[] = {
+       SR_KHZ(20),
+       SR_KHZ(25),
+       SR_KHZ(50),
+       SR_KHZ(100),
+       SR_KHZ(200),
+       SR_KHZ(250),
+       SR_KHZ(500),
        SR_MHZ(1),
        SR_MHZ(2),
        SR_MHZ(3),
@@ -66,88 +131,76 @@ static uint64_t fx2lafw_supported_samplerates[] = {
        SR_MHZ(8),
        SR_MHZ(12),
        SR_MHZ(16),
-       SR_MHZ(24)
+       SR_MHZ(24),
+       0,
 };
 
-static struct sr_samplerates fx2lafw_samplerates = {
-       SR_MHZ(1),
-       SR_MHZ(24),
-       SR_HZ(0),
-       fx2lafw_supported_samplerates
+static const struct sr_samplerates samplerates = {
+       0,
+       0,
+       0,
+       supported_samplerates,
 };
 
 static GSList *dev_insts = NULL;
 static libusb_context *usb_context = NULL;
 
+static int hw_dev_config_set(int dev_index, int hwcap, const void *value);
+static int hw_dev_acquisition_stop(int dev_index, void *cb_data);
+
 /**
  * Check the USB configuration to determine if this is an fx2lafw device.
  *
- * @return true if the device's configuration profile match fx2lafw
- *         configuration, flase otherwise.
+ * @return TRUE if the device's configuration profile match fx2lafw
+ *         configuration, FALSE otherwise.
  */
-static bool check_conf_profile(libusb_device *dev)
+static gboolean check_conf_profile(libusb_device *dev)
 {
        struct libusb_device_descriptor des;
-       struct libusb_config_descriptor *conf_dsc = NULL;
-       const struct libusb_interface_descriptor *intf_dsc;
-       bool ret = false;
+       struct libusb_device_handle *hdl;
+       gboolean ret;
+       unsigned char strdesc[64];
 
+       hdl = NULL;
+       ret = FALSE;
        while (!ret) {
-               /* Assume it's not a Saleae Logic unless proven wrong. */
-               ret = 0;
-
+               /* Assume the FW has not been loaded, unless proven wrong. */
                if (libusb_get_device_descriptor(dev, &des) != 0)
                        break;
 
-               if (des.bNumConfigurations != 1)
-                       /* Need exactly 1 configuration. */
+               if (libusb_open(dev, &hdl) != 0)
                        break;
 
-               if (libusb_get_config_descriptor(dev, 0, &conf_dsc) != 0)
+               if (libusb_get_string_descriptor_ascii(hdl,
+                               des.iManufacturer, strdesc, sizeof(strdesc)) < 0)
                        break;
-
-               if (conf_dsc->bNumInterfaces != 1)
-                       /* Need exactly 1 interface. */
+               if (strncmp((const char *)strdesc, "sigrok", 6))
                        break;
 
-               if (conf_dsc->interface[0].num_altsetting != 1)
-                       /* Need just one alternate setting. */
+               if (libusb_get_string_descriptor_ascii(hdl,
+                               des.iProduct, strdesc, sizeof(strdesc)) < 0)
                        break;
-
-               intf_dsc = &(conf_dsc->interface[0].altsetting[0]);
-               if (intf_dsc->bNumEndpoints != 3)
-                       /* Need exactly 3 end points. */
+               if (strncmp((const char *)strdesc, "fx2lafw", 7))
                        break;
 
-               if ((intf_dsc->endpoint[0].bEndpointAddress & 0x8f) !=
-                   (1 | LIBUSB_ENDPOINT_OUT))
-                       /* The first endpoint should be 1 (outbound). */
-                       break;
-
-               if ((intf_dsc->endpoint[1].bEndpointAddress & 0x8f) !=
-                   (2 | LIBUSB_ENDPOINT_IN))
-                       /* The second endpoint should be 2 (inbound). */
-                       break;
-
-               /* TODO: Check the debug channel... */
-
                /* If we made it here, it must be an fx2lafw. */
-               ret = true;
+               ret = TRUE;
        }
-
-       if (conf_dsc)
-               libusb_free_config_descriptor(conf_dsc);
+       if (hdl)
+               libusb_close(hdl);
 
        return ret;
 }
 
-static int fx2lafw_open_dev(int dev_index)
+static int fx2lafw_dev_open(int dev_index)
 {
        libusb_device **devlist;
        struct libusb_device_descriptor des;
        struct sr_dev_inst *sdi;
-       struct fx2lafw_device *ctx;
-       int err, skip, i;
+       struct context *ctx;
+       struct version_info vi;
+       int ret, skip, i;
+       uint8_t revid;
 
        if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
                return SR_ERR;
@@ -158,15 +211,22 @@ static int fx2lafw_open_dev(int dev_index)
                return SR_ERR;
 
        skip = 0;
-       libusb_get_device_list(usb_context, &devlist);
-       for (i = 0; devlist[i]; i++) {
-               if ((err = libusb_get_device_descriptor(devlist[i], &des))) {
-                       sr_err("fx2lafw: failed to get device descriptor: %d", err);
+       const int device_count = libusb_get_device_list(usb_context, &devlist);
+       if (device_count < 0) {
+               sr_err("fx2lafw: Failed to retrieve device list (%d)",
+                       device_count);
+               return SR_ERR;
+       }
+
+       for (i = 0; i < device_count; i++) {
+               if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
+                       sr_err("fx2lafw: Failed to get device descriptor: %d.",
+                              ret);
                        continue;
                }
 
-               if (des.idVendor != FIRMWARE_VID
-                   || des.idProduct != FIRMWARE_PID)
+               if (des.idVendor != ctx->profile->vid
+                   || des.idProduct != ctx->profile->pid)
                        continue;
 
                if (sdi->status == SR_ST_INITIALIZING) {
@@ -186,23 +246,49 @@ static int fx2lafw_open_dev(int dev_index)
                                continue;
                }
 
-               if (!(err = libusb_open(devlist[i], &ctx->usb->devhdl))) {
+               if (!(ret = libusb_open(devlist[i], &ctx->usb->devhdl))) {
                        if (ctx->usb->address == 0xff)
                                /*
                                 * first time we touch this device after firmware upload,
                                 * so we don't know the address yet.
                                 */
                                ctx->usb->address = libusb_get_device_address(devlist[i]);
-
-                       sdi->status = SR_ST_ACTIVE;
-                       sr_info("fx2lafw: opened device %d on %d.%d interface %d",
-                               sdi->index, ctx->usb->bus,
-                               ctx->usb->address, USB_INTERFACE);
                } else {
-                       sr_err("fx2lafw: failed to open device: %d", err);
+                       sr_err("fx2lafw: Failed to open device: %d.", ret);
+                       break;
                }
 
-               /* if we made it here, we handled the device one way or another */
+               ret = command_get_fw_version(ctx->usb->devhdl, &vi);
+               if (ret != SR_OK) {
+                       sr_err("fx2lafw: Failed to retrieve "
+                              "firmware version information.");
+                       break;
+               }
+
+               ret = command_get_revid_version(ctx->usb->devhdl, &revid);
+               if (ret != SR_OK) {
+                       sr_err("fx2lafw: Failed to retrieve REVID.");
+                       break;
+               }
+
+               /*
+                * Changes in major version mean incompatible/API changes, so
+                * bail out if we encounter an incompatible version.
+                * Different minor versions are OK, they should be compatible.
+                */
+               if (vi.major != FX2LAFW_REQUIRED_VERSION_MAJOR) {
+                       sr_err("fx2lafw: Expected firmware version %d.x, "
+                              "got %d.%d.", FX2LAFW_REQUIRED_VERSION_MAJOR,
+                              vi.major, vi.minor);
+                       break;
+               }
+
+               sdi->status = SR_ST_ACTIVE;
+               sr_info("fx2lafw: Opened device %d on %d.%d "
+                       "interface %d, firmware %d.%d, REVID %d.",
+                       sdi->index, ctx->usb->bus, ctx->usb->address,
+                       USB_INTERFACE, vi.major, vi.minor, revid);
+
                break;
        }
        libusb_free_device_list(devlist, 1);
@@ -213,88 +299,155 @@ static int fx2lafw_open_dev(int dev_index)
        return SR_OK;
 }
 
-static struct fx2lafw_device* fx2lafw_device_new(void)
+static void close_dev(struct sr_dev_inst *sdi)
+{
+       struct context *ctx;
+
+       ctx = sdi->priv;
+
+       if (ctx->usb->devhdl == NULL)
+               return;
+
+       sr_info("fx2lafw: Closing device %d on %d.%d interface %d.",
+               sdi->index, ctx->usb->bus, ctx->usb->address, USB_INTERFACE);
+       libusb_release_interface(ctx->usb->devhdl, USB_INTERFACE);
+       libusb_close(ctx->usb->devhdl);
+       ctx->usb->devhdl = NULL;
+       sdi->status = SR_ST_INACTIVE;
+}
+
+static int configure_probes(struct context *ctx, GSList *probes)
+{
+       struct sr_probe *probe;
+       GSList *l;
+       int probe_bit, stage, i;
+       char *tc;
+
+       for (i = 0; i < NUM_TRIGGER_STAGES; i++) {
+               ctx->trigger_mask[i] = 0;
+               ctx->trigger_value[i] = 0;
+       }
+
+       stage = -1;
+       for (l = probes; l; l = l->next) {
+               probe = (struct sr_probe *)l->data;
+               if (probe->enabled == FALSE)
+                       continue;
+
+               if (probe->index > 8)
+                       ctx->sample_wide = TRUE;
+
+               probe_bit = 1 << (probe->index - 1);
+               if (!(probe->trigger))
+                       continue;
+
+               stage = 0;
+               for (tc = probe->trigger; *tc; tc++) {
+                       ctx->trigger_mask[stage] |= probe_bit;
+                       if (*tc == '1')
+                               ctx->trigger_value[stage] |= probe_bit;
+                       stage++;
+                       if (stage > NUM_TRIGGER_STAGES)
+                               return SR_ERR;
+               }
+       }
+
+       if (stage == -1)
+               /*
+                * We didn't configure any triggers, make sure acquisition
+                * doesn't wait for any.
+                */
+               ctx->trigger_stage = TRIGGER_FIRED;
+       else
+               ctx->trigger_stage = 0;
+
+       return SR_OK;
+}
+
+static struct context *fx2lafw_dev_new(void)
 {
-       struct fx2lafw_device *fx2lafw;
+       struct context *ctx;
 
-       if (!(fx2lafw = g_try_malloc0(sizeof(struct fx2lafw_device)))) {
-               sr_err("fx2lafw: %s: fx2lafw_device malloc failed", __func__);
+       if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
+               sr_err("fx2lafw: %s: ctx malloc failed.", __func__);
                return NULL;
        }
 
-       return fx2lafw;
+       ctx->trigger_stage = TRIGGER_FIRED;
+
+       return ctx;
 }
 
 /*
  * API callbacks
  */
 
-static int hw_init(const char *deviceinfo)
+static int hw_init(const char *devinfo)
 {
        struct sr_dev_inst *sdi;
        struct libusb_device_descriptor des;
-       struct fx2lafw_profile *fx2lafw_prof;
-       struct fx2lafw_device *ctx;
+       const struct fx2lafw_profile *prof;
+       struct context *ctx;
        libusb_device **devlist;
-       int err;
+       int ret;
        int devcnt = 0;
        int i, j;
 
        /* Avoid compiler warnings. */
-       (void)deviceinfo;
+       (void)devinfo;
 
        if (libusb_init(&usb_context) != 0) {
-               sr_warn("Failed to initialize USB.");
+               sr_warn("fx2lafw: Failed to initialize libusb.");
                return 0;
        }
 
-       /* Find all fx2lafw compatible devices and upload firware to all of them. */
+       /* Find all fx2lafw compatible devices and upload firmware to them. */
        libusb_get_device_list(usb_context, &devlist);
        for (i = 0; devlist[i]; i++) {
 
-               if ((err = libusb_get_device_descriptor(
-                       devlist[i], &des)) != 0) {
-                       sr_warn("failed to get device descriptor: %d", err);
+               if ((ret = libusb_get_device_descriptor(
+                    devlist[i], &des)) != 0) {
+                       sr_warn("fx2lafw: Failed to get device descriptor: %d.", ret);
                        continue;
                }
 
-               fx2lafw_prof = NULL;
+               prof = NULL;
                for (j = 0; supported_fx2[j].vid; j++) {
                        if (des.idVendor == supported_fx2[j].vid &&
                                des.idProduct == supported_fx2[j].pid) {
-                               fx2lafw_prof = &supported_fx2[j];
+                               prof = &supported_fx2[j];
                        }
                }
 
                /* Skip if the device was not found */
-               if(!fx2lafw_prof)
+               if (!prof)
                        continue;
 
                sdi = sr_dev_inst_new(devcnt, SR_ST_INITIALIZING,
-                       fx2lafw_prof->vendor, fx2lafw_prof->model,
-                       fx2lafw_prof->model_version);
-               if(!sdi)
+                       prof->vendor, prof->model, prof->model_version);
+               if (!sdi)
                        return 0;
 
-               ctx = fx2lafw_device_new();
-               ctx->profile = fx2lafw_prof;
+               ctx = fx2lafw_dev_new();
+               ctx->profile = prof;
                sdi->priv = ctx;
-               device_instances = g_slist_append(dev_insts, sdi);
+               dev_insts = g_slist_append(dev_insts, sdi);
 
                if (check_conf_profile(devlist[i])) {
                        /* Already has the firmware, so fix the new address. */
-                       sr_dbg("fx2lafw: Found a fx2lafw device.");
+                       sr_dbg("fx2lafw: Found an fx2lafw device.");
                        sdi->status = SR_ST_INACTIVE;
                        ctx->usb = sr_usb_dev_inst_new
                            (libusb_get_bus_number(devlist[i]),
                             libusb_get_device_address(devlist[i]), NULL);
                } else {
-                       if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION, FIRMWARE) == SR_OK)
+                       if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION,
+                               prof->firmware) == SR_OK)
                                /* Remember when the firmware on this device was updated */
-                               g_get_current_time(&ctx->fw_updated);
+                               ctx->fw_updated = g_get_monotonic_time();
                        else
-                               sr_err("fx2lafw: firmware upload failed for "
-                                      "device %d", devcnt);
+                               sr_err("fx2lafw: Firmware upload failed for "
+                                      "device %d.", devcnt);
                        ctx->usb = sr_usb_dev_inst_new
                                (libusb_get_bus_number(devlist[i]), 0xff, NULL);
                }
@@ -306,57 +459,89 @@ static int hw_init(const char *deviceinfo)
        return devcnt;
 }
 
-static int hw_dev_open(int device_index)
+static int hw_dev_open(int dev_index)
 {
-       GTimeVal cur_time;
        struct sr_dev_inst *sdi;
-       struct fx2lafw_device *ctx;
-       int timediff, err;
+       struct context *ctx;
+       int ret;
+       int64_t timediff_us, timediff_ms;
 
-       if (!(sdi = sr_dev_inst_get(dev_insts, device_index)))
+       if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
                return SR_ERR;
        ctx = sdi->priv;
 
        /*
-        * if the firmware was recently uploaded, wait up to MAX_RENUM_DELAY ms
-        * for the FX2 to renumerate
+        * If the firmware was recently uploaded, wait up to MAX_RENUM_DELAY_MS
+        * milliseconds for the FX2 to renumerate.
         */
-       err = 0;
-       if (GTV_TO_MSEC(ctx->fw_updated) > 0) {
-               sr_info("fx2lafw: waiting for device to reset");
+       ret = SR_ERR;
+       if (ctx->fw_updated > 0) {
+               sr_info("fx2lafw: Waiting for device to reset.");
                /* takes at least 300ms for the FX2 to be gone from the USB bus */
                g_usleep(300 * 1000);
-               timediff = 0;
-               while (timediff < MAX_RENUM_DELAY) {
-                       if ((err = fx2lafw_open_dev(device_index)) == SR_OK)
+               timediff_ms = 0;
+               while (timediff_ms < MAX_RENUM_DELAY_MS) {
+                       if ((ret = fx2lafw_dev_open(dev_index)) == SR_OK)
                                break;
                        g_usleep(100 * 1000);
-                       g_get_current_time(&cur_time);
-                       timediff = GTV_TO_MSEC(cur_time) - GTV_TO_MSEC(ctx->fw_updated);
+
+                       timediff_us = g_get_monotonic_time() - ctx->fw_updated;
+                       timediff_ms = timediff_us / 1000;
+                       sr_spew("fx2lafw: waited %" PRIi64 " ms", timediff_ms);
                }
-               sr_info("fx2lafw: device came back after %d ms", timediff);
+               sr_info("fx2lafw: Device came back after %d ms.", timediff_ms);
        } else {
-               err = fx2lafw_open_dev(device_index);
+               ret = fx2lafw_dev_open(dev_index);
        }
 
-       if (err != SR_OK) {
-               sr_err("fx2lafw: unable to open device");
+       if (ret != SR_OK) {
+               sr_err("fx2lafw: Unable to open device.");
                return SR_ERR;
        }
        ctx = sdi->priv;
 
-       err = libusb_claim_interface(ctx->usb->devhdl, USB_INTERFACE);
-       if (err != 0) {
-               sr_err("fx2lafw: Unable to claim interface: %d", err);
+       ret = libusb_claim_interface(ctx->usb->devhdl, USB_INTERFACE);
+       if (ret != 0) {
+               switch(ret) {
+               case LIBUSB_ERROR_BUSY:
+                       sr_err("fx2lafw: Unable to claim USB interface. Another "
+                               "program or driver has already claimed it.");
+                       break;
+
+               case LIBUSB_ERROR_NO_DEVICE:
+                       sr_err("fx2lafw: Device has been disconnected.");
+                       break;
+
+               default:
+                       sr_err("fx2lafw: Unable to claim interface: %d.", ret);
+                       break;
+               }
+
                return SR_ERR;
        }
 
+       if (ctx->cur_samplerate == 0) {
+               /* Samplerate hasn't been set; default to the slowest one. */
+               if (hw_dev_config_set(dev_index, SR_HWCAP_SAMPLERATE,
+                   &supported_samplerates[0]) == SR_ERR)
+                       return SR_ERR;
+       }
+
        return SR_OK;
 }
 
-static int hw_dev_close(int device_index)
+static int hw_dev_close(int dev_index)
 {
-       (void)device_index;
+       struct sr_dev_inst *sdi;
+
+       if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
+               sr_err("fx2lafw: %s: sdi was NULL.", __func__);
+               return SR_ERR_BUG;
+       }
+
+       /* TODO */
+       close_dev(sdi);
+
        return SR_OK;
 }
 
@@ -364,51 +549,72 @@ static int hw_cleanup(void)
 {
        GSList *l;
        struct sr_dev_inst *sdi;
-
-       for(l = device_instances; l; l = l->next) {
+       struct context *ctx;
+       int ret = SR_OK;
+
+       for (l = dev_insts; l; l = l->next) {
+               if (!(sdi = l->data)) {
+                       /* Log error, but continue cleaning up the rest. */
+                       sr_err("fx2lafw: %s: sdi was NULL, continuing.",
+                              __func__);
+                       ret = SR_ERR_BUG;
+                       continue;
+               }
+               if (!(ctx = sdi->priv)) {
+                       /* Log error, but continue cleaning up the rest. */
+                       sr_err("fx2lafw: %s: sdi->priv was NULL, continuing",
+                              __func__);
+                       ret = SR_ERR_BUG;
+                       continue;
+               }
+               close_dev(sdi);
                sdi = l->data;
                sr_dev_inst_free(sdi);
        }
 
-       g_slist_free(device_instances);
-       device_instances = NULL;
+       g_slist_free(dev_insts);
+       dev_insts = NULL;
 
-       if(usb_context)
+       if (usb_context)
                libusb_exit(usb_context);
        usb_context = NULL;
 
-       return SR_OK;
+       return ret;
 }
 
-static void *hw_dev_info_get(int device_index, int device_info_id)
+static const void *hw_dev_info_get(int dev_index, int dev_info_id)
 {
        struct sr_dev_inst *sdi;
-       struct fx2lafw_device *ctx;
+       struct context *ctx;
 
-       if (!(sdi = sr_dev_inst_get(dev_insts, device_index)))
+       if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
                return NULL;
        ctx = sdi->priv;
 
-       switch (device_info_id) {
+       switch (dev_info_id) {
        case SR_DI_INST:
                return sdi;
        case SR_DI_NUM_PROBES:
-               return GINT_TO_POINTER(ctx->profile->num_probes);
+               return GINT_TO_POINTER(
+                       (ctx->profile->dev_caps & DEV_CAPS_16BIT) ?
+                       16 : 8);
        case SR_DI_PROBE_NAMES:
-               return fx2lafw_probe_names;
+               return probe_names;
        case SR_DI_SAMPLERATES:
-               return &fx2lafw_samplerates;
+               return &samplerates;
        case SR_DI_TRIGGER_TYPES:
                return TRIGGER_TYPES;
+       case SR_DI_CUR_SAMPLERATE:
+               return &ctx->cur_samplerate;
        }
 
        return NULL;
 }
 
-static int hw_dev_status_get(int device_index)
+static int hw_dev_status_get(int dev_index)
 {
        const struct sr_dev_inst *const sdi =
-               sr_dev_inst_get(dev_insts, device_index);
+               sr_dev_inst_get(dev_insts, dev_index);
 
        if (!sdi)
                return SR_ST_NOT_FOUND;
@@ -416,37 +622,393 @@ static int hw_dev_status_get(int device_index)
        return sdi->status;
 }
 
-static int *hw_hwcap_get_all(void)
+static const int *hw_hwcap_get_all(void)
 {
-       return fx2lafw_capabilities;
+       return hwcaps;
 }
 
-static int hw_dev_config_set(int dev_index, int capability, void *value)
+static int hw_dev_config_set(int dev_index, int hwcap, const void *value)
 {
-       (void)dev_index;
-       (void)capability;
-       (void)value;
-       return SR_OK;
+       struct sr_dev_inst *sdi;
+       struct context *ctx;
+       int ret;
+
+       if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+               return SR_ERR;
+       ctx = sdi->priv;
+
+       if (hwcap == SR_HWCAP_SAMPLERATE) {
+               ctx->cur_samplerate = *(const uint64_t *)value;
+               ret = SR_OK;
+       } else if (hwcap == SR_HWCAP_PROBECONFIG) {
+               ret = configure_probes(ctx, (GSList *) value);
+       } else if (hwcap == SR_HWCAP_LIMIT_SAMPLES) {
+               ctx->limit_samples = *(const uint64_t *)value;
+               ret = SR_OK;
+       } else {
+               ret = SR_ERR;
+       }
+
+       return ret;
+}
+
+static int receive_data(int fd, int revents, void *cb_data)
+{
+       struct timeval tv;
+
+       /* Avoid compiler warnings. */
+       (void)fd;
+       (void)revents;
+       (void)cb_data;
+
+       tv.tv_sec = tv.tv_usec = 0;
+       libusb_handle_events_timeout(usb_context, &tv);
+
+       return TRUE;
+}
+
+static void abort_acquisition(struct context *ctx)
+{
+       int i;
+
+       ctx->num_samples = -1;
+
+       for (i = ctx->num_transfers - 1; i >= 0; i--) {
+               if (ctx->transfers[i])
+                       libusb_cancel_transfer(ctx->transfers[i]);
+       }
+}
+
+static void finish_acquisition(struct context *ctx)
+{
+       struct sr_datafeed_packet packet;
+       int i;
+
+       /* Terminate session */
+       packet.type = SR_DF_END;
+       sr_session_send(ctx->session_dev_id, &packet);
+
+       /* Remove fds from polling */
+       const struct libusb_pollfd **const lupfd =
+               libusb_get_pollfds(usb_context);
+       for (i = 0; lupfd[i]; i++)
+               sr_source_remove(lupfd[i]->fd);
+       free(lupfd); /* NOT g_free()! */
+
+       ctx->num_transfers = 0;
+       g_free(ctx->transfers);
+}
+
+static void free_transfer(struct libusb_transfer *transfer)
+{
+       struct context *ctx = transfer->user_data;
+       unsigned int i;
+
+       g_free(transfer->buffer);
+       transfer->buffer = NULL;
+       libusb_free_transfer(transfer);
+
+       for (i = 0; i < ctx->num_transfers; i++) {
+               if (ctx->transfers[i] == transfer) {
+                       ctx->transfers[i] = NULL;
+                       break;
+               }
+       }
+
+       ctx->submitted_transfers--;
+       if (ctx->submitted_transfers == 0)
+               finish_acquisition(ctx);
+
+}
+
+static void resubmit_transfer(struct libusb_transfer *transfer)
+{
+       if (libusb_submit_transfer(transfer) != 0) {
+               free_transfer(transfer);
+               /* TODO: Stop session? */
+               /* TODO: Better error message. */
+               sr_err("fx2lafw: %s: libusb_submit_transfer error.", __func__);
+       }
+}
+
+static void receive_transfer(struct libusb_transfer *transfer)
+{
+       gboolean packet_has_error = FALSE;
+       struct sr_datafeed_packet packet;
+       struct sr_datafeed_logic logic;
+       struct context *ctx = transfer->user_data;
+       int trigger_offset, i;
+
+       /*
+        * If acquisition has already ended, just free any queued up
+        * transfer that come in.
+        */
+       if (ctx->num_samples == -1) {
+               free_transfer(transfer);
+               return;
+       }
+
+       sr_info("fx2lafw: receive_transfer(): status %d received %d bytes.",
+               transfer->status, transfer->actual_length);
+
+       /* Save incoming transfer before reusing the transfer struct. */
+       uint8_t *const cur_buf = transfer->buffer;
+       const int sample_width = ctx->sample_wide ? 2 : 1;
+       const int cur_sample_count = transfer->actual_length / sample_width;
+
+       switch (transfer->status) {
+       case LIBUSB_TRANSFER_NO_DEVICE:
+               abort_acquisition(ctx);
+               free_transfer(transfer);
+               return;
+       case LIBUSB_TRANSFER_COMPLETED:
+       case LIBUSB_TRANSFER_TIMED_OUT: /* We may have received some data though */
+               break;
+       default:
+               packet_has_error = TRUE;
+               break;
+       }
+
+       if (transfer->actual_length == 0 || packet_has_error) {
+               ctx->empty_transfer_count++;
+               if (ctx->empty_transfer_count > MAX_EMPTY_TRANSFERS) {
+                       /*
+                        * The FX2 gave up. End the acquisition, the frontend
+                        * will work out that the samplecount is short.
+                        */
+                       abort_acquisition(ctx);
+                       free_transfer(transfer);
+               } else {
+                       resubmit_transfer(transfer);
+               }
+               return;
+       } else {
+               ctx->empty_transfer_count = 0;
+       }
+
+       trigger_offset = 0;
+       if (ctx->trigger_stage >= 0) {
+               for (i = 0; i < cur_sample_count; i++) {
+
+                       const uint16_t cur_sample = ctx->sample_wide ?
+                               *((const uint16_t*)cur_buf + i) :
+                               *((const uint8_t*)cur_buf + i);
+
+                       if ((cur_sample & ctx->trigger_mask[ctx->trigger_stage]) ==
+                               ctx->trigger_value[ctx->trigger_stage]) {
+                               /* Match on this trigger stage. */
+                               ctx->trigger_buffer[ctx->trigger_stage] = cur_sample;
+                               ctx->trigger_stage++;
+
+                               if (ctx->trigger_stage == NUM_TRIGGER_STAGES ||
+                                       ctx->trigger_mask[ctx->trigger_stage] == 0) {
+                                       /* Match on all trigger stages, we're done. */
+                                       trigger_offset = i + 1;
+
+                                       /*
+                                        * TODO: Send pre-trigger buffer to session bus.
+                                        * Tell the frontend we hit the trigger here.
+                                        */
+                                       packet.type = SR_DF_TRIGGER;
+                                       packet.payload = NULL;
+                                       sr_session_send(ctx->session_dev_id, &packet);
+
+                                       /*
+                                        * Send the samples that triggered it, since we're
+                                        * skipping past them.
+                                        */
+                                       packet.type = SR_DF_LOGIC;
+                                       packet.payload = &logic;
+                                       logic.unitsize = sizeof(*ctx->trigger_buffer);
+                                       logic.length = ctx->trigger_stage * logic.unitsize;
+                                       logic.data = ctx->trigger_buffer;
+                                       sr_session_send(ctx->session_dev_id, &packet);
+
+                                       ctx->trigger_stage = TRIGGER_FIRED;
+                                       break;
+                               }
+                       } else if (ctx->trigger_stage > 0) {
+                               /*
+                                * We had a match before, but not in the next sample. However, we may
+                                * have a match on this stage in the next bit -- trigger on 0001 will
+                                * fail on seeing 00001, so we need to go back to stage 0 -- but at
+                                * the next sample from the one that matched originally, which the
+                                * counter increment at the end of the loop takes care of.
+                                */
+                               i -= ctx->trigger_stage;
+                               if (i < -1)
+                                       i = -1; /* Oops, went back past this buffer. */
+                               /* Reset trigger stage. */
+                               ctx->trigger_stage = 0;
+                       }
+               }
+       }
+
+       if (ctx->trigger_stage == TRIGGER_FIRED) {
+               /* Send the incoming transfer to the session bus. */
+               const int trigger_offset_bytes = trigger_offset * sample_width;
+               packet.type = SR_DF_LOGIC;
+               packet.payload = &logic;
+               logic.length = transfer->actual_length - trigger_offset_bytes;
+               logic.unitsize = sample_width;
+               logic.data = cur_buf + trigger_offset_bytes;
+               sr_session_send(ctx->session_dev_id, &packet);
+
+               ctx->num_samples += cur_sample_count;
+               if (ctx->limit_samples &&
+                       (unsigned int)ctx->num_samples > ctx->limit_samples) {
+                       abort_acquisition(ctx);
+                       free_transfer(transfer);
+                       return;
+               }
+       } else {
+               /*
+                * TODO: Buffer pre-trigger data in capture
+                * ratio-sized buffer.
+                */
+       }
+
+       resubmit_transfer(transfer);
+}
+
+static unsigned int to_bytes_per_ms(unsigned int samplerate)
+{
+       return samplerate / 1000;
+}
+
+static size_t get_buffer_size(struct context *ctx)
+{
+       size_t s;
+
+       /* The buffer should be large enough to hold 10ms of data and a multiple
+        * of 512. */
+       s = 10 * to_bytes_per_ms(ctx->cur_samplerate);
+       return (s + 511) & ~511;
+}
+
+static unsigned int get_number_of_transfers(struct context *ctx)
+{
+       unsigned int n;
+
+       /* Total buffer size should be able to hold about 500ms of data */
+       n = 500 * to_bytes_per_ms(ctx->cur_samplerate) / get_buffer_size(ctx);
+
+       if (n > NUM_SIMUL_TRANSFERS)
+               return NUM_SIMUL_TRANSFERS;
+
+       return n;
+}
+
+static unsigned int get_timeout(struct context *ctx)
+{
+       size_t total_size;
+       unsigned int timeout;
+
+       total_size = get_buffer_size(ctx) * get_number_of_transfers(ctx);
+       timeout = total_size / to_bytes_per_ms(ctx->cur_samplerate);
+       return timeout + timeout / 4; /* Leave a headroom of 25% percent */
 }
 
-static int hw_dev_acquisition_start(int dev_index, gpointer session_data)
+static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 {
-       (void)dev_index;
-       (void)session_data;
+       struct sr_dev_inst *sdi;
+       struct sr_datafeed_packet packet;
+       struct sr_datafeed_header header;
+       struct sr_datafeed_meta_logic meta;
+       struct context *ctx;
+       struct libusb_transfer *transfer;
+       const struct libusb_pollfd **lupfd;
+       unsigned int i;
+       int ret;
+       unsigned char *buf;
+
+       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;
+
+       const unsigned int timeout = get_timeout(ctx);
+       const unsigned int num_transfers = get_number_of_transfers(ctx);
+       const size_t size = get_buffer_size(ctx);
+
+       ctx->transfers = g_try_malloc0(sizeof(*ctx->transfers) * num_transfers);
+       if (!ctx->transfers)
+               return SR_ERR;
+
+       ctx->num_transfers = num_transfers;
+
+       for (i = 0; i < num_transfers; i++) {
+               if (!(buf = g_try_malloc(size))) {
+                       sr_err("fx2lafw: %s: buf malloc failed.", __func__);
+                       return SR_ERR_MALLOC;
+               }
+               transfer = libusb_alloc_transfer(0);
+               libusb_fill_bulk_transfer(transfer, ctx->usb->devhdl,
+                               2 | LIBUSB_ENDPOINT_IN, buf, size,
+                               receive_transfer, ctx, timeout);
+               if (libusb_submit_transfer(transfer) != 0) {
+                       libusb_free_transfer(transfer);
+                       g_free(buf);
+                       abort_acquisition(ctx);
+                       return SR_ERR;
+               }
+               ctx->transfers[i] = transfer;
+               ctx->submitted_transfers++;
+       }
+
+       lupfd = libusb_get_pollfds(usb_context);
+       for (i = 0; lupfd[i]; i++)
+               sr_source_add(lupfd[i]->fd, lupfd[i]->events,
+                             timeout, receive_data, NULL);
+       free(lupfd); /* NOT g_free()! */
+
+       packet.type = SR_DF_HEADER;
+       packet.payload = &header;
+       header.feed_version = 1;
+       gettimeofday(&header.starttime, NULL);
+       sr_session_send(cb_data, &packet);
+
+       /* Send metadata about the SR_DF_LOGIC packets to come. */
+       packet.type = SR_DF_META_LOGIC;
+       packet.payload = &meta;
+       meta.samplerate = ctx->cur_samplerate;
+       meta.num_probes = ctx->sample_wide ? 16 : 8;
+       sr_session_send(cb_data, &packet);
+
+       if ((ret = command_start_acquisition (ctx->usb->devhdl,
+               ctx->cur_samplerate, ctx->sample_wide)) != SR_OK) {
+               abort_acquisition(ctx);
+               return ret;
+       }
+
        return SR_OK;
 }
 
-/* This stops acquisition on ALL devices, ignoring device_index. */
-static int hw_dev_acquisition_stop(int dev_index, gpointer session_data)
+/* TODO: This stops acquisition on ALL devices, ignoring dev_index. */
+static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
 {
-       (void)dev_index;
-       (void)session_data;
+       struct sr_dev_inst *sdi;
+
+       /* Avoid compiler warnings. */
+       (void)cb_data;
+
+       if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+               return SR_ERR;
+       abort_acquisition(sdi->priv);
+
        return SR_OK;
 }
 
-SR_PRIV struct sr_dev_plugin fx2lafw_plugin_info = {
+SR_PRIV struct sr_dev_driver fx2lafw_driver_info = {
        .name = "fx2lafw",
-       .longname = "fx2lafw",
+       .longname = "fx2lafw (generic driver for FX2 based LAs)",
        .api_version = 1,
        .init = hw_init,
        .cleanup = hw_cleanup,