X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffx2lafw%2Fapi.c;h=4e4c3cfabce53befad346ec69a8e22773056b9c7;hb=8399f68a3ff44e72b2267d43aaba677b0dbd48b4;hp=8e28f22494cf146b26cc5e40feba453ab37c1ed3;hpb=5e2c86eb3184fdc57341f6a1dd482f83556bf1d9;p=libsigrok.git

diff --git a/src/hardware/fx2lafw/api.c b/src/hardware/fx2lafw/api.c
index 8e28f224..4e4c3cfa 100644
--- a/src/hardware/fx2lafw/api.c
+++ b/src/hardware/fx2lafw/api.c
@@ -18,7 +18,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "protocol.h"
+#include "dslogic.h"
+#include <math.h>
 
 static const struct fx2lafw_profile supported_fx2[] = {
 	/*
@@ -27,23 +30,57 @@ static const struct fx2lafw_profile supported_fx2[] = {
 	 * ARMFLY AX-Pro
 	 */
 	{ 0x08a9, 0x0014, "CWAV", "USBee AX", NULL,
-		FIRMWARE_DIR "/fx2lafw-cwav-usbeeax.fw",
-		0, NULL, NULL},
+		"fx2lafw-cwav-usbeeax.fw",
+		DEV_CAPS_AX_ANALOG, NULL, NULL},
 	/*
 	 * CWAV USBee DX
 	 * XZL-Studio DX
 	 */
 	{ 0x08a9, 0x0015, "CWAV", "USBee DX", NULL,
-		FIRMWARE_DIR "/fx2lafw-cwav-usbeedx.fw",
+		"fx2lafw-cwav-usbeedx.fw",
 		DEV_CAPS_16BIT, NULL, NULL },
 
 	/*
 	 * CWAV USBee SX
 	 */
 	{ 0x08a9, 0x0009, "CWAV", "USBee SX", NULL,
-		FIRMWARE_DIR "/fx2lafw-cwav-usbeesx.fw",
+		"fx2lafw-cwav-usbeesx.fw",
 		0, NULL, NULL},
 
+	/*
+	 * CWAV USBee ZX
+	 */
+	{ 0x08a9, 0x0005, "CWAV", "USBee ZX", NULL,
+		"fx2lafw-cwav-usbeezx.fw",
+		0, NULL, NULL},
+
+	/* DreamSourceLab DSLogic (before FW upload) */
+	{ 0x2a0e, 0x0001, "DreamSourceLab", "DSLogic", NULL,
+		"dreamsourcelab-dslogic-fx2.fw",
+		DEV_CAPS_16BIT, NULL, NULL},
+	/* DreamSourceLab DSLogic (after FW upload) */
+	{ 0x2a0e, 0x0001, "DreamSourceLab", "DSLogic", NULL,
+		"dreamsourcelab-dslogic-fx2.fw",
+		DEV_CAPS_16BIT, "DreamSourceLab", "DSLogic"},
+
+	/* DreamSourceLab DSCope (before FW upload) */
+	{ 0x2a0e, 0x0002, "DreamSourceLab", "DSCope", NULL,
+		"dreamsourcelab-dscope-fx2.fw",
+		DEV_CAPS_16BIT, NULL, NULL},
+	/* DreamSourceLab DSCope (after FW upload) */
+	{ 0x2a0e, 0x0002, "DreamSourceLab", "DSCope", NULL,
+		"dreamsourcelab-dscope-fx2.fw",
+		DEV_CAPS_16BIT, "DreamSourceLab", "DSCope"},
+
+	/* DreamSourceLab DSLogic Pro (before FW upload) */
+	{ 0x2a0e, 0x0003, "DreamSourceLab", "DSLogic Pro", NULL,
+		"dreamsourcelab-dslogic-pro-fx2.fw",
+		DEV_CAPS_16BIT, NULL, NULL},
+	/* DreamSourceLab DSLogic Pro (after FW upload) */
+	{ 0x2a0e, 0x0003, "DreamSourceLab", "DSLogic Pro", NULL,
+		"dreamsourcelab-dslogic-pro-fx2.fw",
+		DEV_CAPS_16BIT, "DreamSourceLab", "DSLogic"},
+
 	/*
 	 * Saleae Logic
 	 * EE Electronics ESLA100
@@ -51,7 +88,7 @@ static const struct fx2lafw_profile supported_fx2[] = {
 	 * Robomotic BugLogic 3
 	 */
 	{ 0x0925, 0x3881, "Saleae", "Logic", NULL,
-		FIRMWARE_DIR "/fx2lafw-saleae-logic.fw",
+		"fx2lafw-saleae-logic.fw",
 		0, NULL, NULL},
 
 	/*
@@ -60,17 +97,35 @@ static const struct fx2lafw_profile supported_fx2[] = {
 	 * Braintechnology USB Interface V2.x
 	 */
 	{ 0x04B4, 0x8613, "Cypress", "FX2", NULL,
-		FIRMWARE_DIR "/fx2lafw-cypress-fx2.fw",
+		"fx2lafw-cypress-fx2.fw",
 		DEV_CAPS_16BIT, NULL, NULL },
 
 	/*
 	 * Braintechnology USB-LPS
 	 */
 	{ 0x16d0, 0x0498, "Braintechnology", "USB-LPS", NULL,
-		FIRMWARE_DIR "/fx2lafw-braintechnology-usb-lps.fw",
+		"fx2lafw-braintechnology-usb-lps.fw",
+		DEV_CAPS_16BIT, NULL, NULL },
+
+	/*
+	 * sigrok FX2 based 8-channel logic analyzer
+	 */
+	{ 0x1d50, 0x608c, "sigrok", "FX2 LA (8ch)", NULL,
+		"fx2lafw-sigrok-fx2-8ch.fw",
+		0, NULL, NULL},
+
+	/*
+	 * sigrok FX2 based 16-channel logic analyzer
+	 */
+	{ 0x1d50, 0x608d, "sigrok", "FX2 LA (16ch)", NULL,
+		"fx2lafw-sigrok-fx2-16ch.fw",
 		DEV_CAPS_16BIT, NULL, NULL },
 
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+	ALL_ZERO
+};
+
+static const uint32_t drvopts[] = {
+	SR_CONF_LOGIC_ANALYZER,
 };
 
 static const uint32_t scanopts[] = {
@@ -78,18 +133,24 @@ static const uint32_t scanopts[] = {
 };
 
 static const uint32_t devopts[] = {
-	SR_CONF_LOGIC_ANALYZER,
 	SR_CONF_CONTINUOUS,
+	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
 	SR_CONF_CONN | SR_CONF_GET,
 	SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
-	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
 	SR_CONF_TRIGGER_MATCH | SR_CONF_LIST,
+	SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET,
 };
 
-static const char *channel_names[] = {
-	"0",  "1",  "2",  "3",  "4",  "5",  "6",  "7",
-	"8",  "9", "10", "11", "12", "13", "14", "15",
-	NULL,
+static const uint32_t dslogic_devopts[] = {
+	SR_CONF_CONTINUOUS | SR_CONF_SET | SR_CONF_GET,
+	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_VOLTAGE_THRESHOLD | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_CONN | SR_CONF_GET,
+	SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_TRIGGER_MATCH | SR_CONF_LIST,
+	SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_EXTERNAL_CLOCK | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_CLOCK_EDGE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
 static const int32_t soft_trigger_matches[] = {
@@ -100,6 +161,21 @@ static const int32_t soft_trigger_matches[] = {
 	SR_TRIGGER_EDGE,
 };
 
+/* Names assigned to available edge slope choices. */
+static const char *const signal_edge_names[] = {
+	[DS_EDGE_RISING] = "rising",
+	[DS_EDGE_FALLING] = "falling",
+};
+
+static const struct {
+	int range;
+	gdouble low;
+	gdouble high;
+} volt_thresholds[] = {
+	{ DS_VOLTAGE_RANGE_18_33_V, 0.7, 1.4 },
+	{ DS_VOLTAGE_RANGE_5_V, 1.4, 3.6 },
+};
+
 static const uint64_t samplerates[] = {
 	SR_KHZ(20),
 	SR_KHZ(25),
@@ -119,32 +195,61 @@ static const uint64_t samplerates[] = {
 	SR_MHZ(24),
 };
 
-SR_PRIV struct sr_dev_driver fx2lafw_driver_info;
-static struct sr_dev_driver *di = &fx2lafw_driver_info;
+static const uint64_t dslogic_samplerates[] = {
+	SR_KHZ(10),
+	SR_KHZ(20),
+	SR_KHZ(50),
+	SR_KHZ(100),
+	SR_KHZ(200),
+	SR_KHZ(500),
+	SR_MHZ(1),
+	SR_MHZ(2),
+	SR_MHZ(5),
+	SR_MHZ(10),
+	SR_MHZ(20),
+	SR_MHZ(25),
+	SR_MHZ(50),
+	SR_MHZ(100),
+	SR_MHZ(200),
+	SR_MHZ(400),
+};
 
-static int init(struct sr_context *sr_ctx)
+static gboolean is_plausible(const struct libusb_device_descriptor *des)
 {
-	return std_init(sr_ctx, di, LOG_PREFIX);
+	int i;
+
+	for (i = 0; supported_fx2[i].vid; i++) {
+		if (des->idVendor != supported_fx2[i].vid)
+			continue;
+		if (des->idProduct == supported_fx2[i].pid)
+			return TRUE;
+	}
+
+	return FALSE;
 }
 
-static GSList *scan(GSList *options)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
 	struct drv_context *drvc;
 	struct dev_context *devc;
 	struct sr_dev_inst *sdi;
 	struct sr_usb_dev_inst *usb;
 	struct sr_channel *ch;
+	struct sr_channel_group *cg;
 	struct sr_config *src;
 	const struct fx2lafw_profile *prof;
 	GSList *l, *devices, *conn_devices;
+	gboolean has_firmware;
 	struct libusb_device_descriptor des;
 	libusb_device **devlist;
 	struct libusb_device_handle *hdl;
-	int num_logic_channels, ret, i, j;
+	int ret, i, j;
+	int num_logic_channels = 0, num_analog_channels = 0;
 	const char *conn;
 	char manufacturer[64], product[64], serial_num[64], connection_id[64];
+	char channel_name[16];
 
-	drvc = di->priv;
+	drvc = di->context;
 
 	conn = NULL;
 	for (l = options; l; l = l->next) {
@@ -178,14 +283,17 @@ static GSList *scan(GSList *options)
 				continue;
 		}
 
-		if ((ret = libusb_get_device_descriptor( devlist[i], &des)) != 0) {
-			sr_warn("Failed to get device descriptor: %s.",
-				libusb_error_name(ret));
+		libusb_get_device_descriptor( devlist[i], &des);
+
+		if (!is_plausible(&des))
 			continue;
-		}
 
-		if ((ret = libusb_open(devlist[i], &hdl)) < 0)
+		if ((ret = libusb_open(devlist[i], &hdl)) < 0) {
+			sr_warn("Failed to open potential device with "
+				"VID:PID %04x:%04x: %s.", des.idVendor,
+				des.idProduct, libusb_error_name(ret));
 			continue;
+		}
 
 		if (des.iManufacturer == 0) {
 			manufacturer[0] = '\0';
@@ -227,7 +335,7 @@ static GSList *scan(GSList *options)
 					des.idProduct == supported_fx2[j].pid &&
 					(!supported_fx2[j].usb_manufacturer ||
 					 !strcmp(manufacturer, supported_fx2[j].usb_manufacturer)) &&
-					(!supported_fx2[j].usb_manufacturer ||
+					(!supported_fx2[j].usb_product ||
 					 !strcmp(product, supported_fx2[j].usb_product))) {
 				prof = &supported_fx2[j];
 				break;
@@ -238,30 +346,63 @@ static GSList *scan(GSList *options)
 		if (!prof)
 			continue;
 
-		sdi = sr_dev_inst_new(0, SR_ST_INITIALIZING,
-			prof->vendor, prof->model, prof->model_version);
-		if (!sdi)
-			return NULL;
-		sdi->driver = di;
+		sdi = g_malloc0(sizeof(struct sr_dev_inst));
+		sdi->status = SR_ST_INITIALIZING;
+		sdi->vendor = g_strdup(prof->vendor);
+		sdi->model = g_strdup(prof->model);
+		sdi->version = g_strdup(prof->model_version);
 		sdi->serial_num = g_strdup(serial_num);
 		sdi->connection_id = g_strdup(connection_id);
 
 		/* Fill in channellist according to this device's profile. */
 		num_logic_channels = prof->dev_caps & DEV_CAPS_16BIT ? 16 : 8;
+		num_analog_channels = prof->dev_caps & DEV_CAPS_AX_ANALOG ? 1 : 0;
+
+		/* Logic channels, all in one channel group. */
+		cg = g_malloc0(sizeof(struct sr_channel_group));
+		cg->name = g_strdup("Logic");
 		for (j = 0; j < num_logic_channels; j++) {
-			if (!(ch = sr_channel_new(j, SR_CHANNEL_LOGIC, TRUE,
-					channel_names[j])))
-				return NULL;
-			sdi->channels = g_slist_append(sdi->channels, ch);
+			sprintf(channel_name, "D%d", j);
+			ch = sr_channel_new(sdi, j, SR_CHANNEL_LOGIC,
+						TRUE, channel_name);
+			cg->channels = g_slist_append(cg->channels, ch);
+		}
+		sdi->channel_groups = g_slist_append(NULL, cg);
+
+		for (j = 0; j < num_analog_channels; j++) {
+			snprintf(channel_name, 16, "A%d", j);
+			ch = sr_channel_new(sdi, j + num_logic_channels,
+					SR_CHANNEL_ANALOG, TRUE, channel_name);
+
+			/* Every analog channel gets its own channel group. */
+			cg = g_malloc0(sizeof(struct sr_channel_group));
+			cg->name = g_strdup(channel_name);
+			cg->channels = g_slist_append(NULL, ch);
+			sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
 		}
 
 		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 (fx2lafw_check_conf_profile(devlist[i])) {
+		if (!strcmp(prof->model, "DSLogic")
+				|| !strcmp(prof->model, "DSLogic Pro")
+				|| !strcmp(prof->model, "DSCope")) {
+			devc->dslogic = TRUE;
+			devc->samplerates = dslogic_samplerates;
+			devc->num_samplerates = ARRAY_SIZE(dslogic_samplerates);
+			has_firmware = match_manuf_prod(devlist[i], "DreamSourceLab", "DSLogic")
+					|| match_manuf_prod(devlist[i], "DreamSourceLab", "DSCope");
+		} else {
+			devc->dslogic = FALSE;
+			devc->samplerates = samplerates;
+			devc->num_samplerates = ARRAY_SIZE(samplerates);
+			has_firmware = match_manuf_prod(devlist[i],
+					"sigrok", "fx2lafw");
+		}
+
+		if (has_firmware) {
 			/* Already has the firmware, so fix the new address. */
 			sr_dbg("Found an fx2lafw device.");
 			sdi->status = SR_ST_INACTIVE;
@@ -269,8 +410,8 @@ static GSList *scan(GSList *options)
 			sdi->conn = 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,
-				prof->firmware) == SR_OK)
+			if (ezusb_upload_firmware(drvc->sr_ctx, devlist[i],
+					USB_CONFIGURATION, prof->firmware) == SR_OK)
 				/* Store when this device's FW was updated. */
 				devc->fw_updated = g_get_monotonic_time();
 			else
@@ -286,18 +427,29 @@ static GSList *scan(GSList *options)
 	libusb_free_device_list(devlist, 1);
 	g_slist_free_full(conn_devices, (GDestroyNotify)sr_usb_dev_inst_free);
 
-	return devices;
+	return std_scan_complete(di, devices);
+}
+
+static void clear_dev_context(void *priv)
+{
+	struct dev_context *devc;
+
+	devc = priv;
+	g_slist_free(devc->enabled_analog_channels);
+	g_free(devc);
 }
 
-static GSList *dev_list(void)
+static int dev_clear(const struct sr_dev_driver *di)
 {
-	return ((struct drv_context *)(di->priv))->instances;
+	return std_dev_clear(di, clear_dev_context);
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
 {
+	struct sr_dev_driver *di = sdi->driver;
 	struct sr_usb_dev_inst *usb;
 	struct dev_context *devc;
+	const char *fpga_firmware = NULL;
 	int ret;
 	int64_t timediff_us, timediff_ms;
 
@@ -357,9 +509,24 @@ static int dev_open(struct sr_dev_inst *sdi)
 		return SR_ERR;
 	}
 
+	if (devc->dslogic) {
+		if (!strcmp(devc->profile->model, "DSLogic")) {
+			if (devc->dslogic_voltage_threshold == DS_VOLTAGE_RANGE_18_33_V)
+				fpga_firmware = DSLOGIC_FPGA_FIRMWARE_3V3;
+			else
+				fpga_firmware = DSLOGIC_FPGA_FIRMWARE_5V;
+		} else if (!strcmp(devc->profile->model, "DSLogic Pro")){
+			fpga_firmware = DSLOGIC_PRO_FPGA_FIRMWARE;
+		} else if (!strcmp(devc->profile->model, "DSCope")) {
+			fpga_firmware = DSCOPE_FPGA_FIRMWARE;
+		}
+
+		if ((ret = dslogic_fpga_firmware_upload(sdi, fpga_firmware)) != SR_OK)
+			return ret;
+	}
 	if (devc->cur_samplerate == 0) {
 		/* Samplerate hasn't been set; default to the slowest one. */
-		devc->cur_samplerate = samplerates[0];
+		devc->cur_samplerate = devc->samplerates[0];
 	}
 
 	return SR_OK;
@@ -370,7 +537,8 @@ static int dev_close(struct sr_dev_inst *sdi)
 	struct sr_usb_dev_inst *usb;
 
 	usb = sdi->conn;
-	if (usb->devhdl == NULL)
+
+	if (!usb->devhdl)
 		return SR_ERR;
 
 	sr_info("fx2lafw: Closing device on %d.%d (logical) / %s (physical) interface %d.",
@@ -383,27 +551,13 @@ static int dev_close(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-static int cleanup(void)
-{
-	int ret;
-	struct drv_context *drvc;
-
-	if (!(drvc = di->priv))
-		return SR_OK;
-
-	ret = std_dev_clear(di, NULL);
-
-	g_free(drvc);
-	di->priv = NULL;
-
-	return ret;
-}
-
-static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *cg)
+static int config_get(uint32_t key, GVariant **data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
 	struct sr_usb_dev_inst *usb;
+	GVariant *range[2];
+	unsigned int i;
 	char str[128];
 
 	(void)cg;
@@ -425,12 +579,37 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 		snprintf(str, 128, "%d.%d", usb->bus, usb->address);
 		*data = g_variant_new_string(str);
 		break;
+	case SR_CONF_VOLTAGE_THRESHOLD:
+		for (i = 0; i < ARRAY_SIZE(volt_thresholds); i++) {
+			if (volt_thresholds[i].range != devc->dslogic_voltage_threshold)
+				continue;
+			range[0] = g_variant_new_double(volt_thresholds[i].low);
+			range[1] = g_variant_new_double(volt_thresholds[i].high);
+			*data = g_variant_new_tuple(range, 2);
+			break;
+		}
+		break;
 	case SR_CONF_LIMIT_SAMPLES:
 		*data = g_variant_new_uint64(devc->limit_samples);
 		break;
 	case SR_CONF_SAMPLERATE:
 		*data = g_variant_new_uint64(devc->cur_samplerate);
 		break;
+	case SR_CONF_CAPTURE_RATIO:
+		*data = g_variant_new_uint64(devc->capture_ratio);
+		break;
+	case SR_CONF_EXTERNAL_CLOCK:
+		*data = g_variant_new_boolean(devc->dslogic_external_clock);
+		break;
+	case SR_CONF_CONTINUOUS:
+		*data = g_variant_new_boolean(devc->dslogic_continuous_mode);
+		break;
+	case SR_CONF_CLOCK_EDGE:
+		i = devc->dslogic_clock_edge;
+		if (i >= ARRAY_SIZE(signal_edge_names))
+			return SR_ERR_BUG;
+		*data = g_variant_new_string(signal_edge_names[0]);
+		break;
 	default:
 		return SR_ERR_NA;
 	}
@@ -438,13 +617,35 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 	return SR_OK;
 }
 
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *cg)
+/*
+ * Helper for mapping a string-typed configuration value to an index
+ * within a table of possible values.
+ */
+static int lookup_index(GVariant *value, const char *const *table, int len)
+{
+	const char *entry;
+	int i;
+
+	entry = g_variant_get_string(value, NULL);
+	if (!entry)
+		return -1;
+
+	/* Linear search is fine for very small tables. */
+	for (i = 0; i < len; i++) {
+		if (strcmp(entry, table[i]) == 0)
+			return i;
+	}
+
+	return -1;
+}
+
+static int config_set(uint32_t key, GVariant *data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
 	uint64_t arg;
-	unsigned int i;
-	int ret;
+	int i, ret;
+	gdouble low, high;
 
 	(void)cg;
 
@@ -459,34 +660,71 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 	ret = SR_OK;
 
 	switch (key) {
-		case SR_CONF_SAMPLERATE:
-			arg = g_variant_get_uint64(data);
-			for (i = 0; i < ARRAY_SIZE(samplerates); i++) {
-				if (samplerates[i] == arg) {
-					devc->cur_samplerate = arg;
-					break;
-				}
+	case SR_CONF_SAMPLERATE:
+		arg = g_variant_get_uint64(data);
+		for (i = 0; i < devc->num_samplerates; i++) {
+			if (devc->samplerates[i] == arg) {
+				devc->cur_samplerate = arg;
+				break;
 			}
-			if (i == ARRAY_SIZE(samplerates))
-				ret = SR_ERR_ARG;
-			break;
-		case SR_CONF_LIMIT_SAMPLES:
-			devc->limit_samples = g_variant_get_uint64(data);
-			break;
-		default:
-			ret = SR_ERR_NA;
+		}
+		if (i == devc->num_samplerates)
+			ret = SR_ERR_ARG;
+		break;
+	case SR_CONF_LIMIT_SAMPLES:
+		devc->limit_samples = g_variant_get_uint64(data);
+		break;
+	case SR_CONF_CAPTURE_RATIO:
+		devc->capture_ratio = g_variant_get_uint64(data);
+		ret = (devc->capture_ratio > 100) ? SR_ERR : SR_OK;
+		break;
+	case SR_CONF_VOLTAGE_THRESHOLD:
+		g_variant_get(data, "(dd)", &low, &high);
+		ret = SR_ERR_ARG;
+		for (i = 0; (unsigned int)i < ARRAY_SIZE(volt_thresholds); i++) {
+			if (fabs(volt_thresholds[i].low - low) < 0.1 &&
+			    fabs(volt_thresholds[i].high - high) < 0.1) {
+				devc->dslogic_voltage_threshold = volt_thresholds[i].range;
+				break;
+			}
+		}
+		if (!strcmp(devc->profile->model, "DSLogic")) {
+			if (devc->dslogic_voltage_threshold == DS_VOLTAGE_RANGE_5_V)
+				ret = dslogic_fpga_firmware_upload(sdi, DSLOGIC_FPGA_FIRMWARE_5V);
+			else
+				ret = dslogic_fpga_firmware_upload(sdi, DSLOGIC_FPGA_FIRMWARE_3V3);
+		} else if (!strcmp(devc->profile->model, "DSLogic Pro")) {
+			ret = dslogic_fpga_firmware_upload(sdi, DSLOGIC_PRO_FPGA_FIRMWARE);
+		}
+		break;
+	case SR_CONF_EXTERNAL_CLOCK:
+		devc->dslogic_external_clock = g_variant_get_boolean(data);
+		break;
+	case SR_CONF_CONTINUOUS:
+		devc->dslogic_continuous_mode = g_variant_get_boolean(data);
+		break;
+	case SR_CONF_CLOCK_EDGE:
+		i = lookup_index(data, signal_edge_names,
+		 		   ARRAY_SIZE(signal_edge_names));
+		if (i < 0)
+			return SR_ERR_ARG;
+		devc->dslogic_clock_edge = i;
+		break;		
+	default:
+		ret = SR_ERR_NA;
 	}
 
 	return ret;
 }
 
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *cg)
+static int config_list(uint32_t key, GVariant **data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
-	GVariant *gvar;
+	struct dev_context *devc;
+	GVariant *gvar, *range[2];
 	GVariantBuilder gvb;
+	unsigned int i;
 
-	(void)sdi;
 	(void)cg;
 
 	switch (key) {
@@ -495,13 +733,39 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 				scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
 		break;
 	case SR_CONF_DEVICE_OPTIONS:
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
+		if (!sdi) {
+			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+				drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
+		} else {
+			devc = sdi->priv;
+			if (!devc->dslogic)
+				*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+								  devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
+			else
+				*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+								  dslogic_devopts, ARRAY_SIZE(dslogic_devopts), sizeof(uint32_t));
+		}
+		break;
+	case SR_CONF_VOLTAGE_THRESHOLD:
+		if (!sdi->priv)
+			return SR_ERR_ARG;
+		devc = sdi->priv;
+		if (!devc->dslogic)
+			return SR_ERR_NA;
+		g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
+		for (i = 0; i < ARRAY_SIZE(volt_thresholds); i++) {
+			range[0] = g_variant_new_double(volt_thresholds[i].low);
+			range[1] = g_variant_new_double(volt_thresholds[i].high);
+			gvar = g_variant_new_tuple(range, 2);
+			g_variant_builder_add_value(&gvb, gvar);
+		}
+		*data = g_variant_builder_end(&gvb);
 		break;
 	case SR_CONF_SAMPLERATE:
+		devc = sdi->priv;
 		g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
-		gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), samplerates,
-				ARRAY_SIZE(samplerates), sizeof(uint64_t));
+		gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), devc->samplerates,
+				devc->num_samplerates, sizeof(uint64_t));
 		g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar);
 		*data = g_variant_builder_end(&gvb);
 		break;
@@ -510,6 +774,10 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 				soft_trigger_matches, ARRAY_SIZE(soft_trigger_matches),
 				sizeof(int32_t));
 		break;
+	case SR_CONF_CLOCK_EDGE:
+		*data = g_variant_new_strv(signal_edge_names,
+			ARRAY_SIZE(signal_edge_names));
+		break;
 	default:
 		return SR_ERR_NA;
 	}
@@ -524,9 +792,8 @@ static int receive_data(int fd, int revents, void *cb_data)
 
 	(void)fd;
 	(void)revents;
-	(void)cb_data;
 
-	drvc = di->priv;
+	drvc = (struct drv_context *)cb_data;
 
 	tv.tv_sec = tv.tv_usec = 0;
 	libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
@@ -534,38 +801,49 @@ static int receive_data(int fd, int revents, void *cb_data)
 	return TRUE;
 }
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
+static int start_transfers(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
-	struct drv_context *drvc;
 	struct sr_usb_dev_inst *usb;
 	struct sr_trigger *trigger;
 	struct libusb_transfer *transfer;
-	unsigned int i, timeout, num_transfers;
-	int ret;
+	unsigned int i, num_transfers;
+	int endpoint, timeout, ret;
 	unsigned char *buf;
 	size_t size;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
-	drvc = di->priv;
 	devc = sdi->priv;
 	usb = sdi->conn;
 
-	devc->cb_data = cb_data;
 	devc->sent_samples = 0;
 	devc->acq_aborted = FALSE;
 	devc->empty_transfer_count = 0;
 
-	if ((trigger = sr_session_trigger_get(sdi->session))) {
-		devc->stl = soft_trigger_logic_new(sdi, trigger);
+	if ((trigger = sr_session_trigger_get(sdi->session)) && !devc->dslogic) {
+		int pre_trigger_samples = 0;
+		if (devc->limit_samples > 0)
+			pre_trigger_samples = devc->capture_ratio * devc->limit_samples/100;
+		devc->stl = soft_trigger_logic_new(sdi, trigger, pre_trigger_samples);
+		if (!devc->stl)
+			return SR_ERR_MALLOC;
 		devc->trigger_fired = FALSE;
 	} else
 		devc->trigger_fired = TRUE;
 
-	timeout = fx2lafw_get_timeout(devc);
 	num_transfers = fx2lafw_get_number_of_transfers(devc);
+
+	//if (devc->dslogic)
+	//	num_transfers = dslogic_get_number_of_transfers(devc);
+
+	if (devc->dslogic) {
+		if (devc->cur_samplerate == SR_MHZ(100))
+			num_transfers = 16;
+		else if (devc->cur_samplerate == SR_MHZ(200))
+			num_transfers = 8;
+		else if (devc->cur_samplerate == SR_MHZ(400))
+			num_transfers = 4;
+	}
+
 	size = fx2lafw_get_buffer_size(devc);
 	devc->submitted_transfers = 0;
 
@@ -575,6 +853,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 		return SR_ERR_MALLOC;
 	}
 
+	timeout = fx2lafw_get_timeout(devc);
+	endpoint = devc->dslogic ? 6 : 2;
 	devc->num_transfers = num_transfers;
 	for (i = 0; i < num_transfers; i++) {
 		if (!(buf = g_try_malloc(size))) {
@@ -583,8 +863,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 		}
 		transfer = libusb_alloc_transfer(0);
 		libusb_fill_bulk_transfer(transfer, usb->devhdl,
-				2 | LIBUSB_ENDPOINT_IN, buf, size,
+				endpoint | LIBUSB_ENDPOINT_IN, buf, size,
 				fx2lafw_receive_transfer, (void *)sdi, timeout);
+		sr_info("submitting transfer: %d", i);
 		if ((ret = libusb_submit_transfer(transfer)) != 0) {
 			sr_err("Failed to submit transfer: %s.",
 			       libusb_error_name(ret));
@@ -597,39 +878,205 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 		devc->submitted_transfers++;
 	}
 
-	devc->ctx = drvc->sr_ctx;
+	if (devc->profile->dev_caps & DEV_CAPS_AX_ANALOG)
+		devc->send_data_proc = mso_send_data_proc;
+	else
+		devc->send_data_proc = la_send_data_proc;
+
+	std_session_send_df_header(sdi);
+
+	return SR_OK;
+}
+
+static void LIBUSB_CALL dslogic_trigger_receive(struct libusb_transfer *transfer)
+{
+	const struct sr_dev_inst *sdi;
+	struct dslogic_trigger_pos *tpos;
+	struct dev_context *devc;
 
-	usb_source_add(sdi->session, devc->ctx, timeout, receive_data, NULL);
+	sdi = transfer->user_data;
+	devc = sdi->priv;
+	if (transfer->status == LIBUSB_TRANSFER_CANCELLED) {
+		sr_dbg("Trigger transfer canceled.");
+		/* Terminate session. */
+		std_session_send_df_end(sdi);
+		usb_source_remove(sdi->session, devc->ctx);
+		devc->num_transfers = 0;
+		g_free(devc->transfers);
+		if (devc->stl) {
+			soft_trigger_logic_free(devc->stl);
+			devc->stl = NULL;
+		}
+	} else if (transfer->status == LIBUSB_TRANSFER_COMPLETED
+			&& transfer->actual_length == sizeof(struct dslogic_trigger_pos)) {
+		tpos = (struct dslogic_trigger_pos *)transfer->buffer;
+		sr_info("tpos real_pos %d ram_saddr %d cnt %d", tpos->real_pos,
+			tpos->ram_saddr, tpos->remain_cnt);
+		devc->trigger_pos = tpos->real_pos;
+		g_free(tpos);
+		start_transfers(sdi);
+	}
+	libusb_free_transfer(transfer);
+}
 
-	/* Send header packet to the session bus. */
-	std_session_send_df_header(cb_data, LOG_PREFIX);
+static int dslogic_trigger_request(const struct sr_dev_inst *sdi)
+{
+	struct sr_usb_dev_inst *usb;
+	struct libusb_transfer *transfer;
+	struct dslogic_trigger_pos *tpos;
+	struct dev_context *devc;
+	int ret;
+
+	usb = sdi->conn;
+	devc = sdi->priv;
+
+	if ((ret = dslogic_stop_acquisition(sdi)) != SR_OK)
+		return ret;
+
+	if ((ret = dslogic_fpga_configure(sdi)) != SR_OK)
+		return ret;
+
+	/* If this is a DSLogic Pro, set the voltage threshold. */
+	if (!strcmp(devc->profile->model, "DSLogic Pro")){
+		if (devc->dslogic_voltage_threshold == DS_VOLTAGE_RANGE_18_33_V) {
+			dslogic_set_vth(sdi, 1.4);
+		} else {
+			dslogic_set_vth(sdi, 3.3);
+		}
+	}
 
-	if ((ret = fx2lafw_command_start_acquisition(sdi)) != SR_OK) {
-		fx2lafw_abort_acquisition(devc);
+	if ((ret = dslogic_start_acquisition(sdi)) != SR_OK)
 		return ret;
+
+	sr_dbg("Getting trigger.");
+	tpos = g_malloc(sizeof(struct dslogic_trigger_pos));
+	transfer = libusb_alloc_transfer(0);
+	libusb_fill_bulk_transfer(transfer, usb->devhdl, 6 | LIBUSB_ENDPOINT_IN,
+			(unsigned char *)tpos, sizeof(struct dslogic_trigger_pos),
+			dslogic_trigger_receive, (void *)sdi, 0);
+	if ((ret = libusb_submit_transfer(transfer)) < 0) {
+		sr_err("Failed to request trigger: %s.", libusb_error_name(ret));
+		libusb_free_transfer(transfer);
+		g_free(tpos);
+		return SR_ERR;
+	}
+
+	devc->transfers = g_try_malloc0(sizeof(*devc->transfers));
+	if (!devc->transfers) {
+		sr_err("USB trigger_pos transfer malloc failed.");
+		return SR_ERR_MALLOC;
+	}
+	devc->num_transfers = 1;
+	devc->submitted_transfers++;
+	devc->transfers[0] = transfer;
+
+	return ret;
+}
+
+static int configure_channels(const struct sr_dev_inst *sdi)
+{
+	struct dev_context *devc;
+	const GSList *l;
+	int p;
+	struct sr_channel *ch;
+	uint32_t channel_mask = 0, num_analog = 0;
+
+	devc = sdi->priv;
+
+	g_slist_free(devc->enabled_analog_channels);
+	devc->enabled_analog_channels = NULL;
+	memset(devc->ch_enabled, 0, sizeof(devc->ch_enabled));
+
+	for (l = sdi->channels, p = 0; l; l = l->next, p++) {
+		ch = l->data;
+		if ((p <= NUM_CHANNELS) && (ch->type == SR_CHANNEL_ANALOG)) {
+			num_analog++;
+			devc->ch_enabled[p] = ch->enabled;
+			devc->enabled_analog_channels =
+			    g_slist_append(devc->enabled_analog_channels, ch);
+		} else {
+			channel_mask |= ch->enabled << p;
+		}
+	}
+
+	/* Use no wide sampling if we have only the first 8 channels set. */
+	devc->sample_wide = (channel_mask > 0xff || num_analog > 0);
+
+	return SR_OK;
+}
+
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
+{
+	struct sr_dev_driver *di;
+	struct drv_context *drvc;
+	struct dev_context *devc;
+	int timeout, ret;
+	size_t size;
+
+	if (sdi->status != SR_ST_ACTIVE)
+		return SR_ERR_DEV_CLOSED;
+
+	di = sdi->driver;
+	drvc = di->context;
+	devc = sdi->priv;
+
+	devc->ctx = drvc->sr_ctx;
+	devc->sent_samples = 0;
+	devc->empty_transfer_count = 0;
+	devc->acq_aborted = FALSE;
+
+	if (configure_channels(sdi) != SR_OK) {
+		sr_err("Failed to configure channels.");
+		return SR_ERR;
+	}
+
+	timeout = fx2lafw_get_timeout(devc);
+	usb_source_add(sdi->session, devc->ctx, timeout, receive_data, drvc);
+
+	if (devc->dslogic) {
+		dslogic_trigger_request(sdi);
+	} else {
+		size = fx2lafw_get_buffer_size(devc);
+		/* Prepare for analog sampling. */
+		if (devc->profile->dev_caps & DEV_CAPS_AX_ANALOG) {
+			/* We need a buffer half the size of a transfer. */
+			devc->logic_buffer = g_try_malloc(size / 2);
+			devc->analog_buffer = g_try_malloc(
+				sizeof(float) * size / 2);
+		}
+		start_transfers(sdi);
+		if ((ret = fx2lafw_command_start_acquisition(sdi)) != SR_OK) {
+			fx2lafw_abort_acquisition(devc);
+			return ret;
+		}
 	}
 
 	return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	(void)cb_data;
+	struct dev_context *devc;
+
+	devc = sdi->priv;
+
+	if (devc->dslogic)
+		dslogic_stop_acquisition(sdi);
 
 	fx2lafw_abort_acquisition(sdi->priv);
 
 	return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver fx2lafw_driver_info = {
+static struct sr_dev_driver fx2lafw_driver_info = {
 	.name = "fx2lafw",
 	.longname = "fx2lafw (generic driver for FX2 based LAs)",
 	.api_version = 1,
-	.init = init,
-	.cleanup = cleanup,
+	.init = std_init,
+	.cleanup = std_cleanup,
 	.scan = scan,
-	.dev_list = dev_list,
-	.dev_clear = NULL,
+	.dev_list = std_dev_list,
+	.dev_clear = dev_clear,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,
@@ -637,5 +1084,6 @@ SR_PRIV struct sr_dev_driver fx2lafw_driver_info = {
 	.dev_close = dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = dev_acquisition_stop,
-	.priv = NULL,
+	.context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(fx2lafw_driver_info);