X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffx2lafw%2Ffx2lafw.c;h=7f0c6734fd5246d2dddd2eb54b6fd3e324073ed4;hb=4afdfd4628e9955af02a3ea619ecdfe469f9a9e2;hp=5155e861a5f38f8180422c8687ad4b7a0b44c9fd;hpb=f1898235e85c884cca985e797848930a6b52139a;p=libsigrok.git

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index 5155e861..1bbb4547 100644
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -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
@@ -19,45 +20,91 @@
 
 #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 AX
+	 * EE Electronics ESLA201A
+	 * ARMFLY AX-Pro
+	 */
+	{ 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
+	 */
+	{ 0x08a9, 0x0009, "CWAV", "USBee SX", NULL,
+		FIRMWARE_DIR "/fx2lafw-cwav-usbeesx.fw",
+		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 },
 
-static struct fx2lafw_profile supported_fx2[] = {
-	/* USBee AX */
-	{ 0x08a9, 0x0014, "CWAV", "USBee AX", NULL, 8 },
-	{ 0, 0, 0, 0, 0, 0 }
+	/*
+	 * 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[] = {
-	SR_HWCAP_LOGIC_ANALYZER,
-	SR_HWCAP_SAMPLERATE,
+static const int hwcaps[] = {
+	SR_CONF_LOGIC_ANALYZER,
+	SR_CONF_SAMPLERATE,
 
 	/* These are really implemented in the driver, not the hardware. */
-	SR_HWCAP_LIMIT_SAMPLES,
-	SR_HWCAP_CONTINUOUS,
-	0
+	SR_CONF_LIMIT_SAMPLES,
+	SR_CONF_CONTINUOUS,
+	0,
 };
 
-static const char *fx2lafw_probe_names[] = {
-	"D0",
-	"D1",
-	"D2",
-	"D3",
-	"D4",
-	"D5",
-	"D6",
-	"D7",
-	NULL
+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,111 +113,105 @@ 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 = {
+	.low  = 0,
+	.high = 0,
+	.step = 0,
+	.list = supported_samplerates,
 };
 
-static GSList *dev_insts = NULL;
-static libusb_context *usb_context = NULL;
+SR_PRIV struct sr_dev_driver fx2lafw_driver_info;
+static struct sr_dev_driver *di = &fx2lafw_driver_info;
+static int hw_dev_close(struct sr_dev_inst *sdi);
+static int config_set(int id, const void *value, const struct sr_dev_inst *sdi);
+static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, 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. */
-			break;
-
-		if (conf_dsc->interface[0].num_altsetting != 1)
-			/* Need just one alternate setting. */
+		if (strncmp((const char *)strdesc, "sigrok", 6))
 			break;
 
-		intf_dsc = &(conf_dsc->interface[0].altsetting[0]);
-		if (intf_dsc->bNumEndpoints != 3)
-			/* Need exactly 3 end points. */
+		if (libusb_get_string_descriptor_ascii(hdl,
+				des.iProduct, strdesc, sizeof(strdesc)) < 0)
 			break;
-
-		if ((intf_dsc->endpoint[0].bEndpointAddress & 0x8f) !=
-		    (1 | LIBUSB_ENDPOINT_OUT))
-			/* The first endpoint should be 1 (outbound). */
+		if (strncmp((const char *)strdesc, "fx2lafw", 7))
 			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(struct sr_dev_inst *sdi)
 {
 	libusb_device **devlist;
 	struct libusb_device_descriptor des;
-	struct sr_dev_inst *sdi;
-	struct fx2lafw_device *ctx;
-	int err, skip, i;
+	struct dev_context *devc;
+	struct drv_context *drvc;
+	struct version_info vi;
+	int ret, skip, i, device_count;
+	uint8_t revid;
 
-	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
-		return SR_ERR;
-	ctx = sdi->priv;
+	drvc = di->priv;
+	devc = sdi->priv;
 
 	if (sdi->status == SR_ST_ACTIVE)
-		/* already in use */
+		/* Device is already in use. */
 		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);
+	device_count = libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
+	if (device_count < 0) {
+		sr_err("Failed to get device list: %s.",
+		       libusb_error_name(device_count));
+		return SR_ERR;
+	}
+
+	for (i = 0; i < device_count; i++) {
+		if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
+			sr_err("Failed to get device descriptor: %s.",
+			       libusb_error_name(ret));
 			continue;
 		}
 
-		if (des.idVendor != FIRMWARE_VID
-		    || des.idProduct != FIRMWARE_PID)
+		if (des.idVendor != devc->profile->vid
+		    || des.idProduct != devc->profile->pid)
 			continue;
 
 		if (sdi->status == SR_ST_INITIALIZING) {
-			if (skip != dev_index) {
+			if (skip != sdi->index) {
 				/* Skip devices of this type that aren't the one we want. */
 				skip += 1;
 				continue;
@@ -180,29 +221,58 @@ static int fx2lafw_open_dev(int dev_index)
 			 * This device is fully enumerated, so we need to find
 			 * this device by vendor, product, bus and address.
 			 */
-			if (libusb_get_bus_number(devlist[i]) != ctx->usb->bus
-				|| libusb_get_device_address(devlist[i]) != ctx->usb->address)
-				/* this is not the one */
+			if (libusb_get_bus_number(devlist[i]) != devc->usb->bus
+				|| libusb_get_device_address(devlist[i]) != devc->usb->address)
+				/* This is not the one. */
 				continue;
 		}
 
-		if (!(err = libusb_open(devlist[i], &ctx->usb->devhdl))) {
-			if (ctx->usb->address == 0xff)
+		if (!(ret = libusb_open(devlist[i], &devc->usb->devhdl))) {
+			if (devc->usb->address == 0xff)
 				/*
-				 * first time we touch this device after firmware upload,
-				 * so we don't know the address yet.
+				 * First time we touch this device after FW
+				 * 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);
+				devc->usb->address = libusb_get_device_address(devlist[i]);
 		} else {
-			sr_err("fx2lafw: failed to open device: %d", err);
+			sr_err("Failed to open device: %s.",
+			       libusb_error_name(ret));
+			break;
+		}
+
+		ret = command_get_fw_version(devc->usb->devhdl, &vi);
+		if (ret != SR_OK) {
+			sr_err("Failed to get firmware version.");
+			break;
+		}
+
+		ret = command_get_revid_version(devc->usb->devhdl, &revid);
+		if (ret != SR_OK) {
+			sr_err("Failed to get REVID.");
+			break;
 		}
 
-		/* if we made it here, we handled the device one way or another */
+		/*
+		 * 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("Expected firmware version %d.x, "
+			       "got %d.%d.", FX2LAFW_REQUIRED_VERSION_MAJOR,
+			       vi.major, vi.minor);
+			break;
+		}
+
+		sdi->status = SR_ST_ACTIVE;
+		sr_info("Opened device %d on %d.%d, "
+			"interface %d, firmware %d.%d.",
+			sdi->index, devc->usb->bus, devc->usb->address,
+			USB_INTERFACE, vi.major, vi.minor);
+
+		sr_info("Detected REVID=%d, it's a Cypress CY7C68013%s.",
+			revid, (revid != 1) ? " (FX2)" : "A (FX2LP)");
+
 		break;
 	}
 	libusb_free_device_list(devlist, 1);
@@ -213,275 +283,746 @@ static int fx2lafw_open_dev(int dev_index)
 	return SR_OK;
 }
 
-static void close_dev(struct sr_dev_inst *sdi)
+static int configure_probes(const struct sr_dev_inst *sdi)
 {
-	struct fx2lafw_device *ctx;
+	struct dev_context *devc;
+	struct sr_probe *probe;
+	GSList *l;
+	int probe_bit, stage, i;
+	char *tc;
+
+	devc = sdi->priv;
+	for (i = 0; i < NUM_TRIGGER_STAGES; i++) {
+		devc->trigger_mask[i] = 0;
+		devc->trigger_value[i] = 0;
+	}
 
-	ctx = sdi->priv;
+	stage = -1;
+	for (l = sdi->probes; l; l = l->next) {
+		probe = (struct sr_probe *)l->data;
+		if (probe->enabled == FALSE)
+			continue;
 
-	if (ctx->usb->devhdl == NULL)
-		return;
+		if (probe->index > 7)
+			devc->sample_wide = TRUE;
 
-	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;
+		probe_bit = 1 << (probe->index);
+		if (!(probe->trigger))
+			continue;
+
+		stage = 0;
+		for (tc = probe->trigger; *tc; tc++) {
+			devc->trigger_mask[stage] |= probe_bit;
+			if (*tc == '1')
+				devc->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.
+		 */
+		devc->trigger_stage = TRIGGER_FIRED;
+	else
+		devc->trigger_stage = 0;
+
+	return SR_OK;
 }
 
-static struct fx2lafw_device* fx2lafw_device_new(void)
+static struct dev_context *fx2lafw_dev_new(void)
 {
-	struct fx2lafw_device *fx2lafw;
+	struct dev_context *devc;
 
-	if (!(fx2lafw = g_try_malloc0(sizeof(struct fx2lafw_device)))) {
-		sr_err("fx2lafw: %s: fx2lafw_device malloc failed", __func__);
+	if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
+		sr_err("Device context malloc failed.");
 		return NULL;
 	}
 
-	return fx2lafw;
-}
+	devc->trigger_stage = TRIGGER_FIRED;
 
-/*
- * API callbacks
- */
+	return devc;
+}
 
-static int hw_init(const char *deviceinfo)
+static int clear_instances(void)
 {
+	GSList *l;
 	struct sr_dev_inst *sdi;
+	struct drv_context *drvc;
+	struct dev_context *devc;
+	int ret;
+
+	drvc = di->priv;
+	ret = SR_OK;
+	for (l = drvc->instances; l; l = l->next) {
+		if (!(sdi = l->data)) {
+			/* Log error, but continue cleaning up the rest. */
+			sr_err("sdi was NULL, continuing.");
+			ret = SR_ERR_BUG;
+			continue;
+		}
+		if (!(devc = sdi->priv)) {
+			/* Log error, but continue cleaning up the rest. */
+			sr_err("sdi->priv was NULL, continuing.");
+			ret = SR_ERR_BUG;
+			continue;
+		}
+		hw_dev_close(sdi);
+		sr_usb_dev_inst_free(devc->usb);
+		sdi = l->data;
+		sr_dev_inst_free(sdi);
+	}
+
+	g_slist_free(drvc->instances);
+	drvc->instances = NULL;
+
+	return ret;
+}
+
+static int hw_init(struct sr_context *sr_ctx)
+{
+	return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN);
+}
+
+static GSList *hw_scan(GSList *options)
+{
+	GSList *devices;
 	struct libusb_device_descriptor des;
-	struct fx2lafw_profile *fx2lafw_prof;
-	struct fx2lafw_device *ctx;
+	struct sr_dev_inst *sdi;
+	const struct fx2lafw_profile *prof;
+	struct drv_context *drvc;
+	struct dev_context *devc;
+	struct sr_probe *probe;
 	libusb_device **devlist;
-	int err;
-	int devcnt = 0;
-	int i, j;
+	int devcnt, num_logic_probes, ret, i, j;
 
-	/* Avoid compiler warnings. */
-	(void)deviceinfo;
+	(void)options;
 
-	if (libusb_init(&usb_context) != 0) {
-		sr_warn("Failed to initialize USB.");
-		return 0;
-	}
+	drvc = di->priv;
+
+	/* This scan always invalidates any previous scans. */
+	clear_instances();
 
-	/* Find all fx2lafw compatible devices and upload firware to all of them. */
-	libusb_get_device_list(usb_context, &devlist);
+	/* Find all fx2lafw compatible devices and upload firmware to them. */
+	devices = NULL;
+	libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &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("Failed to get device descriptor: %s.",
+				libusb_error_name(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)
+		/* Skip if the device was not found. */
+		if (!prof)
 			continue;
 
+		devcnt = g_slist_length(drvc->instances);
 		sdi = sr_dev_inst_new(devcnt, SR_ST_INITIALIZING,
-			fx2lafw_prof->vendor, fx2lafw_prof->model,
-			fx2lafw_prof->model_version);
-		if(!sdi)
-			return 0;
+			prof->vendor, prof->model, prof->model_version);
+		if (!sdi)
+			return NULL;
+		sdi->driver = di;
+
+		/* Fill in probelist according to this device's profile. */
+		num_logic_probes = prof->dev_caps & DEV_CAPS_16BIT ? 16 : 8;
+		for (j = 0; j < num_logic_probes; j++) {
+			if (!(probe = sr_probe_new(j, SR_PROBE_LOGIC, TRUE,
+					probe_names[j])))
+				return NULL;
+			sdi->probes = g_slist_append(sdi->probes, probe);
+		}
 
-		ctx = fx2lafw_device_new();
-		ctx->profile = fx2lafw_prof;
-		sdi->priv = ctx;
-		device_instances = g_slist_append(dev_insts, sdi);
+		devc = fx2lafw_dev_new();
+		devc->profile = prof;
+		sdi->priv = devc;
+		drvc->instances = g_slist_append(drvc->instances, sdi);
+		devices = g_slist_append(devices, 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("Found an fx2lafw device.");
 			sdi->status = SR_ST_INACTIVE;
-			ctx->usb = sr_usb_dev_inst_new
+			devc->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)
-				/* Remember when the firmware on this device was updated */
-				g_get_current_time(&ctx->fw_updated);
+			if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION,
+				prof->firmware) == SR_OK)
+				/* Store when this device's FW was updated. */
+				devc->fw_updated = g_get_monotonic_time();
 			else
-				sr_err("fx2lafw: firmware upload failed for "
-				       "device %d", devcnt);
-			ctx->usb = sr_usb_dev_inst_new
+				sr_err("Firmware upload failed for "
+				       "device %d.", devcnt);
+			devc->usb = sr_usb_dev_inst_new
 				(libusb_get_bus_number(devlist[i]), 0xff, NULL);
 		}
-
-		devcnt++;
 	}
 	libusb_free_device_list(devlist, 1);
 
-	return devcnt;
+	return devices;
 }
 
-static int hw_dev_open(int device_index)
+static GSList *hw_dev_list(void)
 {
-	GTimeVal cur_time;
-	struct sr_dev_inst *sdi;
-	struct fx2lafw_device *ctx;
-	int timediff, err;
+	return ((struct drv_context *)(di->priv))->instances;
+}
 
-	if (!(sdi = sr_dev_inst_get(dev_insts, device_index)))
-		return SR_ERR;
-	ctx = sdi->priv;
+static int hw_dev_open(struct sr_dev_inst *sdi)
+{
+	struct dev_context *devc;
+	int ret;
+	int64_t timediff_us, timediff_ms;
+
+	devc = 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");
-		/* takes at least 300ms for the FX2 to be gone from the USB bus */
+	ret = SR_ERR;
+	if (devc->fw_updated > 0) {
+		sr_info("Waiting for device to reset.");
+		/* Takes >= 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(sdi)) == 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() - devc->fw_updated;
+			timediff_ms = timediff_us / 1000;
+			sr_spew("Waited %" PRIi64 "ms.", timediff_ms);
+		}
+		if (ret != SR_OK) {
+			sr_err("Device failed to renumerate.");
+			return SR_ERR;
 		}
-		sr_info("fx2lafw: device came back after %d ms", timediff);
+		sr_info("Device came back after %" PRIi64 "ms.", timediff_ms);
 	} else {
-		err = fx2lafw_open_dev(device_index);
+		sr_info("Firmware upload was not needed.");
+		ret = fx2lafw_dev_open(sdi);
 	}
 
-	if (err != SR_OK) {
-		sr_err("fx2lafw: unable to open device");
+	if (ret != SR_OK) {
+		sr_err("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);
+	devc = sdi->priv;
+
+	ret = libusb_claim_interface(devc->usb->devhdl, USB_INTERFACE);
+	if (ret != 0) {
+		switch(ret) {
+		case LIBUSB_ERROR_BUSY:
+			sr_err("Unable to claim USB interface. Another "
+			       "program or driver has already claimed it.");
+			break;
+		case LIBUSB_ERROR_NO_DEVICE:
+			sr_err("Device has been disconnected.");
+			break;
+		default:
+			sr_err("Unable to claim interface: %s.",
+			       libusb_error_name(ret));
+			break;
+		}
+
 		return SR_ERR;
 	}
 
+	if (devc->cur_samplerate == 0) {
+		/* Samplerate hasn't been set; default to the slowest one. */
+		if (config_set(SR_CONF_SAMPLERATE, &supported_samplerates[0],
+				sdi) == SR_ERR)
+			return SR_ERR;
+	}
+
 	return SR_OK;
 }
 
-static int hw_dev_close(int dev_index)
+static int hw_dev_close(struct sr_dev_inst *sdi)
 {
-	struct sr_dev_inst *sdi;
+	struct dev_context *devc;
 
-	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
-		sr_err("fx2lafw: %s: sdi was NULL", __func__);
-		return SR_ERR; /* TODO: SR_ERR_ARG? */
-	}
+	devc = sdi->priv;
 
-	/* TODO */
-	close_dev(sdi);
+	if (devc->usb->devhdl == NULL)
+		return SR_ERR;
+
+	sr_info("Closing device %d on %d.%d, interface %d.",
+		sdi->index, devc->usb->bus, devc->usb->address, USB_INTERFACE);
+	libusb_release_interface(devc->usb->devhdl, USB_INTERFACE);
+	libusb_close(devc->usb->devhdl);
+	devc->usb->devhdl = NULL;
+	sdi->status = SR_ST_INACTIVE;
 
 	return SR_OK;
 }
 
 static int hw_cleanup(void)
 {
-	GSList *l;
-	struct sr_dev_inst *sdi;
+	struct drv_context *drvc;
+	int ret;
 
-	for(l = device_instances; l; l = l->next) {
-		sdi = l->data;
-		sr_dev_inst_free(sdi);
+	if (!(drvc = di->priv))
+		return SR_OK;
+
+	ret = clear_instances();
+
+	g_free(drvc);
+	di->priv = NULL;
+
+	return ret;
+}
+
+static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
+{
+	struct dev_context *devc;
+
+	switch (id) {
+	case SR_CONF_SAMPLERATE:
+		if (sdi) {
+			devc = sdi->priv;
+			*data = &devc->cur_samplerate;
+		} else
+			return SR_ERR;
+		break;
+	default:
+		return SR_ERR_ARG;
 	}
 
-	g_slist_free(device_instances);
-	device_instances = NULL;
+	return SR_OK;
+}
+
+static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
+{
+	struct dev_context *devc;
+	int ret;
 
-	if(usb_context)
-		libusb_exit(usb_context);
-	usb_context = NULL;
+	devc = sdi->priv;
+
+	if (id == SR_CONF_SAMPLERATE) {
+		devc->cur_samplerate = *(const uint64_t *)value;
+		ret = SR_OK;
+	} else if (id == SR_CONF_LIMIT_SAMPLES) {
+		devc->limit_samples = *(const uint64_t *)value;
+		ret = SR_OK;
+	} else {
+		ret = SR_ERR;
+	}
+
+	return ret;
+}
+
+static int config_list(int key, const void **data, const struct sr_dev_inst *sdi)
+{
+
+	(void)sdi;
+
+	switch (key) {
+	case SR_CONF_DEVICE_OPTIONS:
+		*data = hwcaps;
+		break;
+	case SR_CONF_SAMPLERATE:
+		*data = &samplerates;
+		break;
+	case SR_CONF_TRIGGER_TYPE:
+		*data = TRIGGER_TYPE;
+		break;
+	default:
+		return SR_ERR_ARG;
+	}
 
 	return SR_OK;
 }
 
-static void *hw_dev_info_get(int device_index, int device_info_id)
+static int receive_data(int fd, int revents, void *cb_data)
 {
-	struct sr_dev_inst *sdi;
-	struct fx2lafw_device *ctx;
+	struct timeval tv;
+	struct drv_context *drvc;
 
-	if (!(sdi = sr_dev_inst_get(dev_insts, device_index)))
-		return NULL;
-	ctx = sdi->priv;
-
-	switch (device_info_id) {
-	case SR_DI_INST:
-		return sdi;
-	case SR_DI_NUM_PROBES:
-		return GINT_TO_POINTER(ctx->profile->num_probes);
-	case SR_DI_PROBE_NAMES:
-		return fx2lafw_probe_names;
-	case SR_DI_SAMPLERATES:
-		return &fx2lafw_samplerates;
-	case SR_DI_TRIGGER_TYPES:
-		return TRIGGER_TYPES;
+	(void)fd;
+	(void)revents;
+	(void)cb_data;
+
+	drvc = di->priv;
+
+	tv.tv_sec = tv.tv_usec = 0;
+	libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
+
+	return TRUE;
+}
+
+static void abort_acquisition(struct dev_context *devc)
+{
+	int i;
+
+	devc->num_samples = -1;
+
+	for (i = devc->num_transfers - 1; i >= 0; i--) {
+		if (devc->transfers[i])
+			libusb_cancel_transfer(devc->transfers[i]);
 	}
+}
 
-	return NULL;
+static void finish_acquisition(struct dev_context *devc)
+{
+	struct sr_datafeed_packet packet;
+	struct drv_context *drvc = di->priv;
+	const struct libusb_pollfd **lupfd;
+	int i;
+
+	/* Terminate session. */
+	packet.type = SR_DF_END;
+	sr_session_send(devc->session_dev_id, &packet);
+
+	/* Remove fds from polling. */
+	lupfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx);
+	for (i = 0; lupfd[i]; i++)
+		sr_source_remove(lupfd[i]->fd);
+	free(lupfd); /* NOT g_free()! */
+
+	devc->num_transfers = 0;
+	g_free(devc->transfers);
 }
 
-static int hw_dev_status_get(int device_index)
+static void free_transfer(struct libusb_transfer *transfer)
 {
-	const struct sr_dev_inst *const sdi =
-		sr_dev_inst_get(dev_insts, device_index);
+	struct dev_context *devc;
+	unsigned int i;
+
+	devc = transfer->user_data;
 
-	if (!sdi)
-		return SR_ST_NOT_FOUND;
+	g_free(transfer->buffer);
+	transfer->buffer = NULL;
+	libusb_free_transfer(transfer);
 
-	return sdi->status;
+	for (i = 0; i < devc->num_transfers; i++) {
+		if (devc->transfers[i] == transfer) {
+			devc->transfers[i] = NULL;
+			break;
+		}
+	}
+
+	devc->submitted_transfers--;
+	if (devc->submitted_transfers == 0)
+		finish_acquisition(devc);
 }
 
-static int *hw_hwcap_get_all(void)
+static void resubmit_transfer(struct libusb_transfer *transfer)
 {
-	return fx2lafw_capabilities;
+	int ret;
+
+	if ((ret = libusb_submit_transfer(transfer)) == LIBUSB_SUCCESS)
+		return;
+
+	free_transfer(transfer);
+	/* TODO: Stop session? */
+
+	sr_err("%s: %s", __func__, libusb_error_name(ret));
 }
 
-static int hw_dev_config_set(int dev_index, int capability, void *value)
+static void receive_transfer(struct libusb_transfer *transfer)
 {
-	(void)dev_index;
-	(void)capability;
-	(void)value;
-	return SR_OK;
+	gboolean packet_has_error = FALSE;
+	struct sr_datafeed_packet packet;
+	struct sr_datafeed_logic logic;
+	struct dev_context *devc;
+	int trigger_offset, i, sample_width, cur_sample_count;
+	int trigger_offset_bytes;
+	uint8_t *cur_buf;
+
+	devc = transfer->user_data;
+
+	/*
+	 * If acquisition has already ended, just free any queued up
+	 * transfer that come in.
+	 */
+	if (devc->num_samples == -1) {
+		free_transfer(transfer);
+		return;
+	}
+
+	sr_info("receive_transfer(): status %d received %d bytes.",
+		transfer->status, transfer->actual_length);
+
+	/* Save incoming transfer before reusing the transfer struct. */
+	cur_buf = transfer->buffer;
+	sample_width = devc->sample_wide ? 2 : 1;
+	cur_sample_count = transfer->actual_length / sample_width;
+
+	switch (transfer->status) {
+	case LIBUSB_TRANSFER_NO_DEVICE:
+		abort_acquisition(devc);
+		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) {
+		devc->empty_transfer_count++;
+		if (devc->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(devc);
+			free_transfer(transfer);
+		} else {
+			resubmit_transfer(transfer);
+		}
+		return;
+	} else {
+		devc->empty_transfer_count = 0;
+	}
+
+	trigger_offset = 0;
+	if (devc->trigger_stage >= 0) {
+		for (i = 0; i < cur_sample_count; i++) {
+
+			const uint16_t cur_sample = devc->sample_wide ?
+				*((const uint16_t*)cur_buf + i) :
+				*((const uint8_t*)cur_buf + i);
+
+			if ((cur_sample & devc->trigger_mask[devc->trigger_stage]) ==
+				devc->trigger_value[devc->trigger_stage]) {
+				/* Match on this trigger stage. */
+				devc->trigger_buffer[devc->trigger_stage] = cur_sample;
+				devc->trigger_stage++;
+
+				if (devc->trigger_stage == NUM_TRIGGER_STAGES ||
+					devc->trigger_mask[devc->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(devc->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(*devc->trigger_buffer);
+					logic.length = devc->trigger_stage * logic.unitsize;
+					logic.data = devc->trigger_buffer;
+					sr_session_send(devc->session_dev_id, &packet);
+
+					devc->trigger_stage = TRIGGER_FIRED;
+					break;
+				}
+			} else if (devc->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 -= devc->trigger_stage;
+				if (i < -1)
+					i = -1; /* Oops, went back past this buffer. */
+				/* Reset trigger stage. */
+				devc->trigger_stage = 0;
+			}
+		}
+	}
+
+	if (devc->trigger_stage == TRIGGER_FIRED) {
+		/* Send the incoming transfer to the session bus. */
+		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(devc->session_dev_id, &packet);
+
+		devc->num_samples += cur_sample_count;
+		if (devc->limit_samples &&
+			(unsigned int)devc->num_samples > devc->limit_samples) {
+			abort_acquisition(devc);
+			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 dev_context *devc)
+{
+	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(devc->cur_samplerate);
+	return (s + 511) & ~511;
 }
 
-static int hw_dev_acquisition_start(int dev_index, gpointer session_data)
+static unsigned int get_number_of_transfers(struct dev_context *devc)
 {
-	(void)dev_index;
-	(void)session_data;
+	unsigned int n;
+
+	/* Total buffer size should be able to hold about 500ms of data. */
+	n = 500 * to_bytes_per_ms(devc->cur_samplerate) / get_buffer_size(devc);
+
+	if (n > NUM_SIMUL_TRANSFERS)
+		return NUM_SIMUL_TRANSFERS;
+
+	return n;
+}
+
+static unsigned int get_timeout(struct dev_context *devc)
+{
+	size_t total_size;
+	unsigned int timeout;
+
+	total_size = get_buffer_size(devc) * get_number_of_transfers(devc);
+	timeout = total_size / to_bytes_per_ms(devc->cur_samplerate);
+	return timeout + timeout / 4; /* Leave a headroom of 25% percent. */
+}
+
+static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
+		void *cb_data)
+{
+	struct dev_context *devc;
+	struct drv_context *drvc;
+	struct libusb_transfer *transfer;
+	const struct libusb_pollfd **lupfd;
+	unsigned int i, timeout, num_transfers;
+	int ret;
+	unsigned char *buf;
+	size_t size;
+
+	drvc = di->priv;
+	devc = sdi->priv;
+
+	if (devc->submitted_transfers != 0)
+		return SR_ERR;
+
+	if (configure_probes(sdi) != SR_OK) {
+		sr_err("Failed to configure probes.");
+		return SR_ERR;
+	}
+
+	devc->session_dev_id = cb_data;
+	devc->num_samples = 0;
+	devc->empty_transfer_count = 0;
+
+	timeout = get_timeout(devc);
+	num_transfers = get_number_of_transfers(devc);
+	size = get_buffer_size(devc);
+
+	devc->transfers = g_try_malloc0(sizeof(*devc->transfers) * num_transfers);
+	if (!devc->transfers) {
+		sr_err("USB transfers malloc failed.");
+		return SR_ERR_MALLOC;
+	}
+
+	devc->num_transfers = num_transfers;
+
+	for (i = 0; i < num_transfers; i++) {
+		if (!(buf = g_try_malloc(size))) {
+			sr_err("USB transfer buffer malloc failed.");
+			return SR_ERR_MALLOC;
+		}
+		transfer = libusb_alloc_transfer(0);
+		libusb_fill_bulk_transfer(transfer, devc->usb->devhdl,
+				2 | LIBUSB_ENDPOINT_IN, buf, size,
+				receive_transfer, devc, timeout);
+		if ((ret = libusb_submit_transfer(transfer)) != 0) {
+			sr_err("Failed to submit transfer: %s.",
+			       libusb_error_name(ret));
+			libusb_free_transfer(transfer);
+			g_free(buf);
+			abort_acquisition(devc);
+			return SR_ERR;
+		}
+		devc->transfers[i] = transfer;
+		devc->submitted_transfers++;
+	}
+
+	lupfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx);
+	for (i = 0; lupfd[i]; i++)
+		sr_source_add(lupfd[i]->fd, lupfd[i]->events,
+			      timeout, receive_data, NULL);
+	free(lupfd); /* NOT g_free()! */
+
+	/* Send header packet to the session bus. */
+	std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
+
+	if ((ret = command_start_acquisition(devc->usb->devhdl,
+		devc->cur_samplerate, devc->sample_wide)) != SR_OK) {
+		abort_acquisition(devc);
+		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(struct sr_dev_inst *sdi, void *cb_data)
 {
-	(void)dev_index;
-	(void)session_data;
+	(void)cb_data;
+
+	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,
+	.scan = hw_scan,
+	.dev_list = hw_dev_list,
+	.dev_clear = clear_instances,
+	.config_get = config_get,
+	.config_set = config_set,
+	.config_list = config_list,
 	.dev_open = hw_dev_open,
 	.dev_close = hw_dev_close,
-	.dev_info_get = hw_dev_info_get,
-	.dev_status_get = hw_dev_status_get,
-	.hwcap_get_all = hw_hwcap_get_all,
-	.dev_config_set = hw_dev_config_set,
 	.dev_acquisition_start = hw_dev_acquisition_start,
 	.dev_acquisition_stop = hw_dev_acquisition_stop,
+	.priv = NULL,
 };