X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fzeroplus.c;h=ba91fd5cd0c4d2601a10711780c7b2acd9024c8a;hb=035a1078fda93cf1da37d19b3a1d95311b99b00f;hp=8bfc5ad830be0a342a3115a0fd819d42eeda758c;hpb=590b9f9a91a703ceea4c430566735d05a2acf82b;p=libsigrok.git

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index 8bfc5ad8..ba91fd5c 100644
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -24,16 +24,17 @@
 #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 "analyzer.h"
 
 #define USB_VENDOR			0x0c12
-#define USB_VENDOR_NAME			"Zeroplus"
-#define USB_MODEL_NAME			"Logic Cube"
-#define USB_MODEL_VERSION		""
 
+#define VENDOR_NAME			"ZEROPLUS"
+#define MODEL_NAME			"Logic Cube LAP-C"
+#define MODEL_VERSION			NULL
+
+#define NUM_PROBES			16
 #define USB_INTERFACE			0
 #define USB_CONFIGURATION		1
 #define NUM_TRIGGER_STAGES		4
@@ -41,9 +42,12 @@
 
 #define PACKET_SIZE			2048	/* ?? */
 
+//#define ZP_EXPERIMENTAL
+
 typedef struct {
+	unsigned short vid;
 	unsigned short pid;
-	char model_name[64];
+	char *model_name;
 	unsigned int channels;
 	unsigned int sample_depth;	/* In Ksamples/channel */
 	unsigned int max_sampling_freq;
@@ -54,23 +58,25 @@ typedef struct {
  * same 128K sample depth.
  */
 static model_t zeroplus_models[] = {
-	{0x7009, "LAP-C(16064)",  16, 64,   100},
-	{0x700A, "LAP-C(16128)",  16, 128,  200},
-	{0x700B, "LAP-C(32128)",  32, 128,  200},
-	{0x700C, "LAP-C(321000)", 32, 1024, 200},
-	{0x700D, "LAP-C(322000)", 32, 2048, 200},
-	{0x700E, "LAP-C(16032)",  16, 32,   100},
-	{0x7016, "LAP-C(162000)", 16, 2048, 200},
+	{0x0c12, 0x7009, "LAP-C(16064)",  16, 64,   100},
+	{0x0c12, 0x700A, "LAP-C(16128)",  16, 128,  200},
+	/* TODO: we don't know anything about these
+	{0x0c12, 0x700B, "LAP-C(32128)",  32, 128,  200},
+	{0x0c12, 0x700C, "LAP-C(321000)", 32, 1024, 200},
+	{0x0c12, 0x700D, "LAP-C(322000)", 32, 2048, 200},
+	*/
+	{0x0c12, 0x700E, "LAP-C(16032)",  16, 32,   100},
+	{0x0c12, 0x7016, "LAP-C(162000)", 16, 2048, 200},
+	{ 0, 0, 0, 0, 0, 0 }
 };
 
-static int hwcaps[] = {
-	SR_HWCAP_LOGIC_ANALYZER,
-	SR_HWCAP_SAMPLERATE,
-	SR_HWCAP_PROBECONFIG,
-	SR_HWCAP_CAPTURE_RATIO,
+static const int hwcaps[] = {
+	SR_CONF_LOGIC_ANALYZER,
+	SR_CONF_SAMPLERATE,
+	SR_CONF_CAPTURE_RATIO,
 
 	/* These are really implemented in the driver, not the hardware. */
-	SR_HWCAP_LIMIT_SAMPLES,
+	SR_CONF_LIMIT_SAMPLES,
 	0,
 };
 
@@ -78,30 +84,15 @@ static int hwcaps[] = {
  * ZEROPLUS LAP-C (16032) numbers the 16 probes A0-A7 and B0-B7.
  * We currently ignore other untested/unsupported devices here.
  */
-static const char *probe_names[] = {
-	"A0",
-	"A1",
-	"A2",
-	"A3",
-	"A4",
-	"A5",
-	"A6",
-	"A7",
-	"B0",
-	"B1",
-	"B2",
-	"B3",
-	"B4",
-	"B5",
-	"B6",
-	"B7",
+static const char *probe_names[NUM_PROBES + 1] = {
+	"A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7",
+	"B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7",
 	NULL,
 };
 
 /* List of struct sr_dev_inst, maintained by dev_open()/dev_close(). */
-static GSList *dev_insts = NULL;
-
-static libusb_context *usb_context = NULL;
+SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info;
+static struct sr_dev_driver *di = &zeroplus_logic_cube_driver_info;
 
 /*
  * The hardware supports more samplerates than these, but these are the
@@ -112,7 +103,7 @@ static libusb_context *usb_context = NULL;
  * TODO: We shouldn't support 150MHz and 200MHz on devices that don't go up
  * that high.
  */
-static uint64_t supported_samplerates[] = {
+static const uint64_t supported_samplerates[] = {
 	SR_HZ(100),
 	SR_HZ(500),
 	SR_KHZ(1),
@@ -134,7 +125,7 @@ static uint64_t supported_samplerates[] = {
 	0,
 };
 
-static struct sr_samplerates samplerates = {
+static const struct sr_samplerates samplerates = {
 	0,
 	0,
 	0,
@@ -142,20 +133,25 @@ static struct sr_samplerates samplerates = {
 };
 
 /* Private, per-device-instance driver context. */
-struct context {
+struct dev_context {
 	uint64_t cur_samplerate;
+	uint64_t max_samplerate;
 	uint64_t limit_samples;
 	int num_channels; /* TODO: This isn't initialized before it's needed :( */
-	uint64_t memory_size;
-	uint8_t probe_mask;
-	uint8_t trigger_mask[NUM_TRIGGER_STAGES];
-	uint8_t trigger_value[NUM_TRIGGER_STAGES];
+	int memory_size;
+	unsigned int max_memory_size;
+	//uint8_t probe_mask;
+	//uint8_t trigger_mask[NUM_TRIGGER_STAGES];
+	//uint8_t trigger_value[NUM_TRIGGER_STAGES];
 	// uint8_t trigger_buffer[NUM_TRIGGER_STAGES];
+	int trigger;
+	unsigned int capture_ratio;
 
+	/* TODO: this belongs in the device instance */
 	struct sr_usb_dev_inst *usb;
 };
 
-static int hw_dev_config_set(int dev_index, int hwcap, void *value);
+static int hw_dev_close(struct sr_dev_inst *sdi);
 
 static unsigned int get_memory_size(int type)
 {
@@ -171,152 +167,118 @@ static unsigned int get_memory_size(int type)
 		return 0;
 }
 
-static int opendev4(struct sr_dev_inst **sdi, libusb_device *dev,
-		    struct libusb_device_descriptor *des)
+#if 0
+static int configure_probes(const struct sr_dev_inst *sdi)
 {
-	struct context *ctx;
-	unsigned int i;
-	int ret;
-
-	/* Note: sdi is non-NULL, the caller already checked this. */
+	struct dev_context *devc;
+	const struct sr_probe *probe;
+	const GSList *l;
+	int probe_bit, stage, i;
+	char *tc;
 
-	if (!(ctx = (*sdi)->priv)) {
-		sr_err("zp: %s: (*sdi)->priv was NULL", __func__);
-		return -1;
-	}
+	/* Note: sdi and sdi->priv are non-NULL, the caller checked this. */
+	devc = sdi->priv;
 
-	if ((ret = libusb_get_device_descriptor(dev, des))) {
-		sr_err("zp: failed to get device descriptor: %d", ret);
-		return -1;
+	devc->probe_mask = 0;
+	for (i = 0; i < NUM_TRIGGER_STAGES; i++) {
+		devc->trigger_mask[i] = 0;
+		devc->trigger_value[i] = 0;
 	}
 
-	if (des->idVendor != USB_VENDOR)
-		return 0;
-
-	if (libusb_get_bus_number(dev) == ctx->usb->bus
-	    && libusb_get_device_address(dev) == ctx->usb->address) {
-
-		for (i = 0; i < ARRAY_SIZE(zeroplus_models); i++) {
-			if (!(des->idProduct == zeroplus_models[i].pid))
-				continue;
-
-			sr_info("zp: Found ZeroPlus device 0x%04x (%s)",
-				des->idProduct, zeroplus_models[i].model_name);
-			ctx->num_channels = zeroplus_models[i].channels;
-			ctx->memory_size = zeroplus_models[i].sample_depth * 1024;
-			break;
-		}
-
-		if (ctx->num_channels == 0) {
-			sr_err("zp: Unknown ZeroPlus device 0x%04x",
-			       des->idProduct);
-			return -2;
-		}
+	stage = -1;
+	for (l = sdi->probes; l; l = l->next) {
+		probe = (struct sr_probe *)l->data;
+		if (probe->enabled == FALSE)
+			continue;
+		probe_bit = 1 << (probe->index);
+		devc->probe_mask |= probe_bit;
 
-		/* Found it. */
-		if (!(ret = libusb_open(dev, &(ctx->usb->devhdl)))) {
-			(*sdi)->status = SR_ST_ACTIVE;
-			sr_info("zp: opened device %d on %d.%d interface %d",
-				(*sdi)->index, ctx->usb->bus,
-				ctx->usb->address, USB_INTERFACE);
-		} else {
-			sr_err("zp: failed to open device: %d", ret);
-			*sdi = NULL;
+		if (probe->trigger) {
+			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;
+			}
 		}
 	}
 
-	return 0;
+	return SR_OK;
 }
+#endif
 
-static struct sr_dev_inst *zp_open_dev(int dev_index)
+static int configure_probes(const struct sr_dev_inst *sdi)
 {
-	struct sr_dev_inst *sdi;
-	libusb_device **devlist;
-	struct libusb_device_descriptor des;
-	int i;
-
-	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
-		return NULL;
-
-	libusb_get_device_list(usb_context, &devlist);
-	if (sdi->status == SR_ST_INACTIVE) {
-		/* Find the device by vendor, product, bus and address. */
-		libusb_get_device_list(usb_context, &devlist);
-		for (i = 0; devlist[i]; i++) {
-			/* TODO: Error handling. */
-			opendev4(&sdi, devlist[i], &des);
-		}
-	} else {
-		/* Status must be SR_ST_ACTIVE, i.e. already in use... */
-		sdi = NULL;
-	}
-	libusb_free_device_list(devlist, 1);
-
-	if (sdi && sdi->status != SR_ST_ACTIVE)
-		sdi = NULL;
+	struct dev_context *devc;
+	const GSList *l;
+	const struct sr_probe *probe;
+	char *tc;
+	int type;
 
-	return sdi;
-}
+	/* Note: sdi and sdi->priv are non-NULL, the caller checked this. */
+	devc = sdi->priv;
 
-static void close_dev(struct sr_dev_inst *sdi)
-{
-	struct context *ctx;
+	for (l = sdi->probes; l; l = l->next) {
+		probe = (struct sr_probe *)l->data;
+		if (probe->enabled == FALSE)
+			continue;
 
-	if (!(ctx = sdi->priv)) {
-		sr_err("zp: %s: sdi->priv was NULL", __func__);
-		return; /* FIXME */
+		if ((tc = probe->trigger)) {
+			switch (*tc) {
+			case '1':
+				type = TRIGGER_HIGH;
+				break;
+			case '0':
+				type = TRIGGER_LOW;
+				break;
+#if 0
+			case 'r':
+				type = TRIGGER_POSEDGE;
+				break;
+			case 'f':
+				type = TRIGGER_NEGEDGE;
+				break;
+			case 'c':
+				type = TRIGGER_ANYEDGE;
+				break;
+#endif
+			default:
+				return SR_ERR;
+			}
+			analyzer_add_trigger(probe->index, type);
+			devc->trigger = 1;
+		}
 	}
 
-	if (!ctx->usb->devhdl)
-		return;
-
-	sr_info("zp: 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_reset_device(ctx->usb->devhdl);
-	libusb_close(ctx->usb->devhdl);
-	ctx->usb->devhdl = NULL;
-	/* TODO: Call libusb_exit() here or only in hw_cleanup()? */
-	sdi->status = SR_ST_INACTIVE;
+	return SR_OK;
 }
 
-static int configure_probes(struct sr_dev_inst *sdi, GSList *probes)
+static int clear_instances(void)
 {
-	struct context *ctx;
-	struct sr_probe *probe;
 	GSList *l;
-	int probe_bit, stage, i;
-	char *tc;
-
-	/* Note: sdi and sdi->priv are non-NULL, the caller checked this. */
-	ctx = sdi->priv;
-
-	ctx->probe_mask = 0;
-	for (i = 0; i < NUM_TRIGGER_STAGES; i++) {
-		ctx->trigger_mask[i] = 0;
-		ctx->trigger_value[i] = 0;
-	}
+	struct sr_dev_inst *sdi;
+	struct drv_context *drvc;
+	struct dev_context *devc;
 
-	stage = -1;
-	for (l = probes; l; l = l->next) {
-		probe = (struct sr_probe *)l->data;
-		if (probe->enabled == FALSE)
+	drvc = di->priv;
+	for (l = drvc->instances; l; l = l->next) {
+		sdi = l->data;
+		if (!(devc = sdi->priv)) {
+			/* Log error, but continue cleaning up the rest. */
+			sr_err("zeroplus: %s: sdi->priv was NULL, continuing", __func__);
 			continue;
-		probe_bit = 1 << (probe->index - 1);
-		ctx->probe_mask |= probe_bit;
-
-		if (probe->trigger) {
-			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;
-			}
 		}
+		sr_usb_dev_inst_free(devc->usb);
+		/* Properly close all devices... */
+		hw_dev_close(sdi);
+		/* ...and free all their memory. */
+		sr_dev_inst_free(sdi);
 	}
+	g_slist_free(drvc->instances);
+	drvc->instances = NULL;
 
 	return SR_OK;
 }
@@ -325,120 +287,194 @@ static int configure_probes(struct sr_dev_inst *sdi, GSList *probes)
  * API callbacks
  */
 
-static int hw_init(const char *devinfo)
+static int hw_init(struct sr_context *sr_ctx)
+{
+	struct drv_context *drvc;
+
+	if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
+		sr_err("zeroplus: driver context malloc failed.");
+		return SR_ERR_MALLOC;
+	}
+	drvc->sr_ctx = sr_ctx;
+	di->priv = drvc;
+
+	return SR_OK;
+}
+
+static GSList *hw_scan(GSList *options)
 {
 	struct sr_dev_inst *sdi;
+	struct sr_probe *probe;
+	struct drv_context *drvc;
+	struct dev_context *devc;
+	model_t *prof;
 	struct libusb_device_descriptor des;
 	libusb_device **devlist;
-	int ret, devcnt, i;
-	struct context *ctx;
+	GSList *devices;
+	int ret, devcnt, i, j;
 
-	/* Avoid compiler warnings. */
-	(void)devinfo;
+	(void)options;
 
-	/* Allocate memory for our private driver context. */
-	if (!(ctx = g_try_malloc(sizeof(struct context)))) {
-		sr_err("zp: %s: ctx malloc failed", __func__);
-		return 0;
-	}
+	drvc = di->priv;
+	devices = NULL;
 
-	/* Set some sane defaults. */
-	ctx->cur_samplerate = 0;
-	ctx->limit_samples = 0;
-	ctx->num_channels = 32; /* TODO: This isn't initialized before it's needed :( */
-	ctx->memory_size = 0;
-	ctx->probe_mask = 0;
-	memset(ctx->trigger_mask, 0, NUM_TRIGGER_STAGES);
-	memset(ctx->trigger_value, 0, NUM_TRIGGER_STAGES);
-	// memset(ctx->trigger_buffer, 0, NUM_TRIGGER_STAGES);
-
-	if (libusb_init(&usb_context) != 0) {
-		sr_err("zp: Failed to initialize USB.");
-		return 0;
-	}
+	clear_instances();
 
-	/* Find all ZeroPlus analyzers and add them to device list. */
+	/* Find all ZEROPLUS analyzers and add them to device list. */
 	devcnt = 0;
-	libusb_get_device_list(usb_context, &devlist); /* TODO: Errors. */
+	libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist); /* TODO: Errors. */
 
 	for (i = 0; devlist[i]; i++) {
 		ret = libusb_get_device_descriptor(devlist[i], &des);
 		if (ret != 0) {
-			sr_err("zp: failed to get device descriptor: %d", ret);
+			sr_err("zp: failed to get device descriptor: %s",
+			       libusb_error_name(ret));
 			continue;
 		}
 
-		if (des.idVendor == USB_VENDOR) {
-			/*
-			 * Definitely a Zeroplus.
-			 * TODO: Any way to detect specific model/version in
-			 * the zeroplus range?
-			 */
-			/* Register the device with libsigrok. */
-			if (!(sdi = sr_dev_inst_new(devcnt,
-					SR_ST_INACTIVE, USB_VENDOR_NAME,
-					USB_MODEL_NAME, USB_MODEL_VERSION))) {
-				sr_err("zp: %s: sr_dev_inst_new failed",
-				       __func__);
-				return 0;
+		prof = NULL;
+		for (j = 0; j < zeroplus_models[j].vid; j++) {
+			if (des.idVendor == zeroplus_models[j].vid &&
+				des.idProduct == zeroplus_models[j].pid) {
+				prof = &zeroplus_models[j];
 			}
+		}
+		/* Skip if the device was not found */
+		if (!prof)
+			continue;
+		sr_info("zp: Found ZEROPLUS model %s", prof->model_name);
 
-			sdi->priv = ctx;
+		/* Register the device with libsigrok. */
+		if (!(sdi = sr_dev_inst_new(devcnt, SR_ST_INACTIVE,
+				VENDOR_NAME, prof->model_name, NULL))) {
+			sr_err("zp: %s: sr_dev_inst_new failed", __func__);
+			return NULL;
+		}
+		sdi->driver = di;
 
-			dev_insts =
-			    g_slist_append(dev_insts, sdi);
-			ctx->usb = sr_usb_dev_inst_new(
-				libusb_get_bus_number(devlist[i]),
-				libusb_get_device_address(devlist[i]), NULL);
-			devcnt++;
+		/* Allocate memory for our private driver context. */
+		if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
+			sr_err("zp: %s: devc malloc failed", __func__);
+			return NULL;
 		}
+		sdi->priv = devc;
+		devc->num_channels = prof->channels;
+#ifdef ZP_EXPERIMENTAL
+		devc->max_memory_size = 128 * 1024;
+		devc->max_samplerate = 200;
+#else
+		devc->max_memory_size = prof->sample_depth * 1024;
+		devc->max_samplerate = prof->max_sampling_freq;
+#endif
+		devc->max_samplerate *= SR_MHZ(1);
+		devc->memory_size = MEMORY_SIZE_8K;
+		// memset(devc->trigger_buffer, 0, NUM_TRIGGER_STAGES);
+
+		/* Fill in probelist according to this device's profile. */
+		for (j = 0; j < devc->num_channels; j++) {
+			if (!(probe = sr_probe_new(j, SR_PROBE_LOGIC, TRUE,
+					probe_names[j])))
+				return NULL;
+			sdi->probes = g_slist_append(sdi->probes, probe);
+		}
+
+		devices = g_slist_append(devices, sdi);
+		drvc->instances = g_slist_append(drvc->instances, sdi);
+		devc->usb = sr_usb_dev_inst_new(
+			libusb_get_bus_number(devlist[i]),
+			libusb_get_device_address(devlist[i]), NULL);
+		devcnt++;
+
 	}
 	libusb_free_device_list(devlist, 1);
 
-	return devcnt;
+	return devices;
 }
 
-static int hw_dev_open(int dev_index)
+static GSList *hw_dev_list(void)
 {
-	struct sr_dev_inst *sdi;
-	struct context *ctx;
-	int ret;
+	struct drv_context *drvc;
 
-	if (!(sdi = zp_open_dev(dev_index))) {
-		sr_err("zp: unable to open device");
-		return SR_ERR;
-	}
+	drvc = di->priv;
 
-	/* TODO: Note: sdi is retrieved in zp_open_dev(). */
+	return drvc->instances;
+}
+
+static int hw_dev_open(struct sr_dev_inst *sdi)
+{
+	struct dev_context *devc;
+	struct drv_context *drvc = di->priv;
+	libusb_device **devlist, *dev;
+	struct libusb_device_descriptor des;
+	int device_count, ret, i;
 
-	if (!(ctx = sdi->priv)) {
+	if (!(devc = sdi->priv)) {
 		sr_err("zp: %s: sdi->priv was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
-	ret = libusb_set_configuration(ctx->usb->devhdl, USB_CONFIGURATION);
+	device_count = libusb_get_device_list(drvc->sr_ctx->libusb_ctx,
+					      &devlist);
+	if (device_count < 0) {
+		sr_err("zp: Failed to retrieve device list");
+		return SR_ERR;
+	}
+
+	dev = NULL;
+	for (i = 0; i < device_count; i++) {
+		if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
+			sr_err("zp: Failed to get device descriptor: %s.",
+			       libusb_error_name(ret));
+			continue;
+		}
+		if (libusb_get_bus_number(devlist[i]) == devc->usb->bus
+		    && libusb_get_device_address(devlist[i]) == devc->usb->address) {
+			dev = devlist[i];
+			break;
+		}
+	}
+	if (!dev) {
+		sr_err("device on bus %d address %d disappeared!",
+				devc->usb->bus, devc->usb->address);
+		return SR_ERR;
+	}
+
+	if (!(ret = libusb_open(dev, &(devc->usb->devhdl)))) {
+		sdi->status = SR_ST_ACTIVE;
+		sr_info("zp: opened device %d on %d.%d interface %d",
+			sdi->index, devc->usb->bus,
+			devc->usb->address, USB_INTERFACE);
+	} else {
+		sr_err("zp: failed to open device: %s", libusb_error_name(ret));
+		return SR_ERR;
+	}
+
+	ret = libusb_set_configuration(devc->usb->devhdl, USB_CONFIGURATION);
 	if (ret < 0) {
-		sr_err("zp: Unable to set USB configuration %d: %d",
-		       USB_CONFIGURATION, ret);
+		sr_err("zp: Unable to set USB configuration %d: %s",
+		       USB_CONFIGURATION, libusb_error_name(ret));
 		return SR_ERR;
 	}
 
-	ret = libusb_claim_interface(ctx->usb->devhdl, USB_INTERFACE);
+	ret = libusb_claim_interface(devc->usb->devhdl, USB_INTERFACE);
 	if (ret != 0) {
-		sr_err("zp: Unable to claim interface: %d", ret);
+		sr_err("zp: Unable to claim interface: %s",
+		       libusb_error_name(ret));
 		return SR_ERR;
 	}
 
-	analyzer_reset(ctx->usb->devhdl);
-	analyzer_initialize(ctx->usb->devhdl);
+	/* Set default configuration after power on */
+	if (analyzer_read_status(devc->usb->devhdl) == 0)
+		analyzer_configure(devc->usb->devhdl);
+
+	analyzer_reset(devc->usb->devhdl);
+	analyzer_initialize(devc->usb->devhdl);
 
-	analyzer_set_memory_size(MEMORY_SIZE_512K);
+	//analyzer_set_memory_size(MEMORY_SIZE_512K);
 	// analyzer_set_freq(g_freq, g_freq_scale);
 	analyzer_set_trigger_count(1);
 	// analyzer_set_ramsize_trigger_address((((100 - g_pre_trigger)
 	// * get_memory_size(g_memory_size)) / 100) >> 2);
-	analyzer_set_ramsize_trigger_address(
-		(100 * get_memory_size(MEMORY_SIZE_512K) / 100) >> 2);
 
 #if 0
 	if (g_double_mode == 1)
@@ -449,212 +485,242 @@ static int hw_dev_open(int dev_index)
 #endif
 	analyzer_set_compression(COMPRESSION_NONE);
 
-	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,
-		     &samplerates.list[0]) == SR_ERR)
-			return SR_ERR;
+	if (devc->cur_samplerate == 0) {
+		/* Samplerate hasn't been set. Default to 1MHz. */
+		analyzer_set_freq(1, FREQ_SCALE_MHZ);
+		devc->cur_samplerate = SR_MHZ(1);
 	}
 
 	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("zp: %s: sdi was NULL", __func__);
-		return SR_ERR; /* TODO: SR_ERR_ARG? */
+	if (!(devc = sdi->priv)) {
+		sr_err("zp: %s: sdi->priv was NULL", __func__);
+		return SR_ERR;
 	}
 
-	/* TODO */
-	close_dev(sdi);
+	if (!devc->usb->devhdl)
+		return SR_ERR;
+
+	sr_info("zp: 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_reset_device(devc->usb->devhdl);
+	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;
 
-	for (l = dev_insts; l; l = l->next) {
-		sdi = l->data;
-		/* Properly close all devices... */
-		close_dev(sdi);
-		/* ...and free all their memory. */
-		sr_dev_inst_free(sdi);
-	}
-	g_slist_free(dev_insts);
-	dev_insts = NULL;
+	if (!(drvc = di->priv))
+		return SR_OK;
 
-	if (usb_context)
-		libusb_exit(usb_context);
-	usb_context = NULL;
+	clear_instances();
 
 	return SR_OK;
 }
 
-static void *hw_dev_info_get(int dev_index, int dev_info_id)
+static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
 {
-	struct sr_dev_inst *sdi;
-	struct context *ctx;
-	void *info;
-
-	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
-		sr_err("zp: %s: sdi was NULL", __func__);
-		return NULL;
-	}
+	struct dev_context *devc;
 
-	if (!(ctx = sdi->priv)) {
-		sr_err("zp: %s: sdi->priv was NULL", __func__);
-		return NULL;
-	}
-
-	switch (dev_info_id) {
-	case SR_DI_INST:
-		info = sdi;
-		break;
-	case SR_DI_NUM_PROBES:
-		info = GINT_TO_POINTER(ctx->num_channels);
-		break;
-	case SR_DI_PROBE_NAMES:
-		info = probe_names;
+	switch (id) {
+	case SR_DI_HWCAPS:
+		*data = hwcaps;
 		break;
 	case SR_DI_SAMPLERATES:
-		info = &samplerates;
+		*data = &samplerates;
+		sr_spew("zp: %s: Returning samplerates.", __func__);
 		break;
 	case SR_DI_TRIGGER_TYPES:
-		info = TRIGGER_TYPES;
+		*data = TRIGGER_TYPES;
+		sr_spew("zp: %s: Returning triggertypes: %s.", __func__, TRIGGER_TYPES);
 		break;
 	case SR_DI_CUR_SAMPLERATE:
-		info = &ctx->cur_samplerate;
+		if (sdi) {
+			devc = sdi->priv;
+			*data = &devc->cur_samplerate;
+			sr_spew("zp: %s: Returning samplerate: %" PRIu64 "Hz.",
+				__func__, devc->cur_samplerate);
+		} else
+			return SR_ERR;
 		break;
 	default:
-		/* Unknown device info ID, return NULL. */
-		sr_err("zp: %s: Unknown device info ID", __func__);
-		info = NULL;
-		break;
+		return SR_ERR_ARG;
 	}
 
-	return info;
+	return SR_OK;
 }
 
-static int hw_dev_status_get(int dev_index)
+static int set_samplerate(struct dev_context *devc, uint64_t samplerate)
 {
-	struct sr_dev_inst *sdi;
+	int i;
 
-	sdi = sr_dev_inst_get(dev_insts, dev_index);
-	if (sdi)
-		return sdi->status;
+	for (i = 0; supported_samplerates[i]; i++)
+		if (samplerate == supported_samplerates[i])
+			break;
+	if (!supported_samplerates[i] || samplerate > devc->max_samplerate) {
+		sr_err("zp: %s: unsupported samplerate", __func__);
+		return SR_ERR_ARG;
+	}
+
+	sr_info("zp: Setting samplerate to %" PRIu64 "Hz.", samplerate);
+
+	if (samplerate >= SR_MHZ(1))
+		analyzer_set_freq(samplerate / SR_MHZ(1), FREQ_SCALE_MHZ);
+	else if (samplerate >= SR_KHZ(1))
+		analyzer_set_freq(samplerate / SR_KHZ(1), FREQ_SCALE_KHZ);
 	else
-		return SR_ST_NOT_FOUND;
-}
+		analyzer_set_freq(samplerate, FREQ_SCALE_HZ);
 
-static int *hw_hwcap_get_all(void)
-{
-	return hwcaps;
+	devc->cur_samplerate = samplerate;
+
+	return SR_OK;
 }
 
-static int set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
+static int set_limit_samples(struct dev_context *devc, uint64_t samples)
 {
-	struct context *ctx;
+	devc->limit_samples = samples;
+
+	if (samples <= 2 * 1024)
+		devc->memory_size = MEMORY_SIZE_8K;
+	else if (samples <= 16 * 1024)
+		devc->memory_size = MEMORY_SIZE_64K;
+	else if (samples <= 32 * 1024 ||
+		 devc->max_memory_size <= 32 * 1024)
+		devc->memory_size = MEMORY_SIZE_128K;
+	else
+		devc->memory_size = MEMORY_SIZE_512K;
 
-	if (!sdi) {
-		sr_err("zp: %s: sdi was NULL", __func__);
-		return SR_ERR_ARG;
-	}
+	sr_info("zp: Setting memory size to %dK.",
+		get_memory_size(devc->memory_size) / 1024);
 
-	if (!(ctx = sdi->priv)) {
-		sr_err("zp: %s: sdi->priv was NULL", __func__);
+	analyzer_set_memory_size(devc->memory_size);
+
+	return SR_OK;
+}
+
+static int set_capture_ratio(struct dev_context *devc, uint64_t ratio)
+{
+	if (ratio > 100) {
+		sr_err("zp: %s: invalid capture ratio", __func__);
 		return SR_ERR_ARG;
 	}
 
-	sr_info("zp: Setting samplerate to %" PRIu64 "Hz.", samplerate);
+	devc->capture_ratio = ratio;
 
-	if (samplerate > SR_MHZ(1))
-		analyzer_set_freq(samplerate / SR_MHZ(1), FREQ_SCALE_MHZ);
-	else if (samplerate > SR_KHZ(1))
-		analyzer_set_freq(samplerate / SR_KHZ(1), FREQ_SCALE_KHZ);
-	else
-		analyzer_set_freq(samplerate, FREQ_SCALE_HZ);
-
-	ctx->cur_samplerate = samplerate;
+	sr_info("zp: Setting capture ratio to %d%%.", devc->capture_ratio);
 
 	return SR_OK;
 }
 
-static int hw_dev_config_set(int dev_index, int hwcap, void *value)
+static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
-	struct sr_dev_inst *sdi;
-	struct context *ctx;
+	struct dev_context *devc;
 
-	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
+	if (!sdi) {
 		sr_err("zp: %s: sdi was NULL", __func__);
-		return SR_ERR;
+		return SR_ERR_ARG;
 	}
 
-	if (!(ctx = sdi->priv)) {
+	if (!(devc = sdi->priv)) {
 		sr_err("zp: %s: sdi->priv was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
-	switch (hwcap) {
-	case SR_HWCAP_SAMPLERATE:
-		return set_samplerate(sdi, *(uint64_t *)value);
-	case SR_HWCAP_PROBECONFIG:
-		return configure_probes(sdi, (GSList *)value);
-	case SR_HWCAP_LIMIT_SAMPLES:
-		ctx->limit_samples = *(uint64_t *)value;
-		return SR_OK;
+	switch (id) {
+	case SR_CONF_SAMPLERATE:
+		return set_samplerate(devc, *(const uint64_t *)value);
+	case SR_CONF_LIMIT_SAMPLES:
+		return set_limit_samples(devc, *(const uint64_t *)value);
+	case SR_CONF_CAPTURE_RATIO:
+		return set_capture_ratio(devc, *(const uint64_t *)value);
 	default:
 		return SR_ERR;
 	}
 }
 
-static int hw_dev_acquisition_start(int dev_index, void *cb_data)
+static void set_triggerbar(struct dev_context *devc)
+{
+	unsigned int ramsize;
+	unsigned int n;
+	unsigned int triggerbar;
+
+	ramsize = get_memory_size(devc->memory_size) / 4;
+	if (devc->trigger) {
+		n = ramsize;
+		if (devc->max_memory_size < n)
+			n = devc->max_memory_size;
+		if (devc->limit_samples < n)
+			n = devc->limit_samples;
+		n = n * devc->capture_ratio / 100;
+		if (n > ramsize - 8)
+			triggerbar = ramsize - 8;
+		else
+			triggerbar = n;
+	} else {
+		triggerbar = 0;
+	}
+	analyzer_set_triggerbar_address(triggerbar);
+	analyzer_set_ramsize_trigger_address(ramsize - triggerbar);
+
+	sr_dbg("zp: triggerbar_address = %d(0x%x)", triggerbar, triggerbar);
+	sr_dbg("zp: ramsize_triggerbar_address = %d(0x%x)",
+	       ramsize - triggerbar, ramsize - triggerbar);
+}
+
+static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
+		void *cb_data)
 {
-	struct sr_dev_inst *sdi;
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_logic logic;
 	struct sr_datafeed_header header;
-	uint64_t samples_read;
+	//uint64_t samples_read;
 	int res;
 	unsigned int packet_num;
+	unsigned int n;
 	unsigned char *buf;
-	struct context *ctx;
+	struct dev_context *devc;
 
-	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
-		sr_err("zp: %s: sdi was NULL", __func__);
-		return SR_ERR;
-	}
-
-	if (!(ctx = sdi->priv)) {
+	if (!(devc = sdi->priv)) {
 		sr_err("zp: %s: sdi->priv was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
+	if (configure_probes(sdi) != SR_OK) {
+		sr_err("zp: failed to configured probes");
+		return SR_ERR;
+	}
+
+	set_triggerbar(devc);
+
 	/* push configured settings to device */
-	analyzer_configure(ctx->usb->devhdl);
+	analyzer_configure(devc->usb->devhdl);
 
-	analyzer_start(ctx->usb->devhdl);
+	analyzer_start(devc->usb->devhdl);
 	sr_info("zp: Waiting for data");
-	analyzer_wait_data(ctx->usb->devhdl);
+	analyzer_wait_data(devc->usb->devhdl);
 
 	sr_info("zp: Stop address    = 0x%x",
-		analyzer_get_stop_address(ctx->usb->devhdl));
+		analyzer_get_stop_address(devc->usb->devhdl));
 	sr_info("zp: Now address     = 0x%x",
-		analyzer_get_now_address(ctx->usb->devhdl));
+		analyzer_get_now_address(devc->usb->devhdl));
 	sr_info("zp: Trigger address = 0x%x",
-		analyzer_get_trigger_address(ctx->usb->devhdl));
+		analyzer_get_trigger_address(devc->usb->devhdl));
 
 	packet.type = SR_DF_HEADER;
 	packet.payload = &header;
 	header.feed_version = 1;
 	gettimeofday(&header.starttime, NULL);
-	header.samplerate = ctx->cur_samplerate;
-	header.num_logic_probes = ctx->num_channels;
 	sr_session_send(cb_data, &packet);
 
 	if (!(buf = g_try_malloc(PACKET_SIZE))) {
@@ -662,13 +728,15 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 		return SR_ERR_MALLOC;
 	}
 
-	samples_read = 0;
-	analyzer_read_start(ctx->usb->devhdl);
+	//samples_read = 0;
+	analyzer_read_start(devc->usb->devhdl);
 	/* Send the incoming transfer to the session bus. */
-	for (packet_num = 0; packet_num < (ctx->memory_size * 4 / PACKET_SIZE);
-	     packet_num++) {
-		res = analyzer_read_data(ctx->usb->devhdl, buf, PACKET_SIZE);
-		sr_info("zp: Tried to read %llx bytes, actually read %x bytes",
+	n = get_memory_size(devc->memory_size);
+	if (devc->max_memory_size * 4 < n)
+		n = devc->max_memory_size * 4;
+	for (packet_num = 0; packet_num < n / PACKET_SIZE; packet_num++) {
+		res = analyzer_read_data(devc->usb->devhdl, buf, PACKET_SIZE);
+		sr_info("zp: Tried to read %d bytes, actually read %d bytes",
 			PACKET_SIZE, res);
 
 		packet.type = SR_DF_LOGIC;
@@ -677,9 +745,9 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 		logic.unitsize = 4;
 		logic.data = buf;
 		sr_session_send(cb_data, &packet);
-		samples_read += res / 4;
+		//samples_read += res / 4;
 	}
-	analyzer_read_stop(ctx->usb->devhdl);
+	analyzer_read_stop(devc->usb->devhdl);
 	g_free(buf);
 
 	packet.type = SR_DF_END;
@@ -689,26 +757,20 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 }
 
 /* TODO: This stops acquisition on ALL devices, ignoring dev_index. */
-static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
+static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
 	struct sr_datafeed_packet packet;
-	struct sr_dev_inst *sdi;
-	struct context *ctx;
+	struct dev_context *devc;
 
 	packet.type = SR_DF_END;
 	sr_session_send(cb_data, &packet);
 
-	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
-		sr_err("zp: %s: sdi was NULL", __func__);
-		return SR_ERR_BUG;
-	}
-
-	if (!(ctx = sdi->priv)) {
+	if (!(devc = sdi->priv)) {
 		sr_err("zp: %s: sdi->priv was NULL", __func__);
 		return SR_ERR_BUG;
 	}
 
-	analyzer_reset(ctx->usb->devhdl);
+	analyzer_reset(devc->usb->devhdl);
 	/* TODO: Need to cancel and free any queued up transfers. */
 
 	return SR_OK;
@@ -716,16 +778,18 @@ static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
 
 SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info = {
 	.name = "zeroplus-logic-cube",
-	.longname = "Zeroplus Logic Cube LAP-C series",
+	.longname = "ZEROPLUS Logic Cube LAP-C series",
 	.api_version = 1,
 	.init = hw_init,
 	.cleanup = hw_cleanup,
+	.scan = hw_scan,
+	.dev_list = hw_dev_list,
+	.dev_clear = hw_cleanup,
+	.config_get = config_get,
+	.config_set = config_set,
 	.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,
 };