X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffx2lafw%2Ffx2lafw.c;h=ddf2f0dc2cdd70996aed382395d882a7ccd883a3;hb=ebc347388240e025181265f7d3d63a22f7bd5da9;hp=b0bd0e6067b6cb06db6924b3ef2eab9ac94a1ba9;hpb=2e526f4a6a96bca01c81620ff820aa39e356977f;p=libsigrok.git

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index b0bd0e60..ddf2f0dc 100644
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -28,10 +28,26 @@
 #include "fx2lafw.h"
 #include "command.h"
 
-static struct fx2lafw_profile supported_fx2[] = {
-	/* USBee AX */
-	{ 0x08a9, 0x0014, "CWAV", "USBee AX", NULL, 8 },
-	{ 0, 0, 0, 0, 0, 0 }
+static const struct fx2lafw_profile supported_fx2[] = {
+	/* CWAV USBee AX
+	 * EE Electronics ESLA201A
+	 */
+	{ 0x08a9, 0x0014, "CWAV", "USBee AX", NULL,
+		FIRMWARE_DIR "/fx2lafw-cwav-usbeeax.fw", 8 },
+
+	/* CWAV USBee SX
+	 */
+	{ 0x08a9, 0x0009, "CWAV", "USBee SX", NULL,
+		FIRMWARE_DIR "/fx2lafw-cwav-usbeesx.fw", 8 },
+
+	/* Saleae Logic
+	 * EE Electronics ESLA100
+	 * Robomotic MiniLogic
+	 */
+	{ 0x0925, 0x3881, "Saleae", "Logic", NULL,
+		FIRMWARE_DIR "/fx2lafw-saleae-logic.fw", 8 },
+
+	{ 0, 0, 0, 0, 0, 0, 0 }
 };
 
 static int fx2lafw_capabilities[] = {
@@ -78,6 +94,7 @@ static struct sr_samplerates fx2lafw_samplerates = {
 static GSList *dev_insts = NULL;
 static libusb_context *usb_context = NULL;
 
+static int hw_dev_config_set(int dev_index, int hwcap, void *value);
 static int hw_dev_acquisition_stop(int dev_index, void *session_dev_id);
 
 /**
@@ -94,7 +111,7 @@ static gboolean check_conf_profile(libusb_device *dev)
 	gboolean ret = FALSE;
 
 	while (!ret) {
-		/* Assume it's not a Saleae Logic unless proven wrong. */
+		/* Assume the firmware has not been loaded, unless proven wrong. */
 		ret = 0;
 
 		if (libusb_get_device_descriptor(dev, &des) != 0)
@@ -116,18 +133,13 @@ static gboolean check_conf_profile(libusb_device *dev)
 			break;
 
 		intf_dsc = &(conf_dsc->interface[0].altsetting[0]);
-		if (intf_dsc->bNumEndpoints != 3)
-			/* Need exactly 3 end points. */
+		if (intf_dsc->bNumEndpoints != 2)
+			/* Need exactly 2 end points. */
 			break;
 
 		if ((intf_dsc->endpoint[0].bEndpointAddress & 0x8f) !=
-		    (1 | LIBUSB_ENDPOINT_OUT))
-			/* The first endpoint should be 1 (outbound). */
-			break;
-
-		if ((intf_dsc->endpoint[1].bEndpointAddress & 0x8f) !=
-		    (2 | LIBUSB_ENDPOINT_IN))
-			/* The second endpoint should be 2 (inbound). */
+		    (2 | LIBUSB_ENDPOINT_IN)) // 0x82
+			/* The first endpoint should be 2 (inbound). */
 			break;
 
 		/* TODO: Check the debug channel... */
@@ -148,7 +160,7 @@ static int fx2lafw_open_dev(int dev_index)
 	struct libusb_device_descriptor des;
 	struct sr_dev_inst *sdi;
 	struct context *ctx;
-	int err, skip, i;
+	int ret, skip, i;
 
 	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
 		return SR_ERR;
@@ -161,8 +173,8 @@ static int fx2lafw_open_dev(int dev_index)
 	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);
+		if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
+			sr_err("fx2lafw: failed to get device descriptor: %d", ret);
 			continue;
 		}
 
@@ -187,7 +199,7 @@ static int fx2lafw_open_dev(int dev_index)
 				continue;
 		}
 
-		if (!(err = libusb_open(devlist[i], &ctx->usb->devhdl))) {
+		if (!(ret = libusb_open(devlist[i], &ctx->usb->devhdl))) {
 			if (ctx->usb->address == 0xff)
 				/*
 				 * first time we touch this device after firmware upload,
@@ -200,7 +212,7 @@ static int fx2lafw_open_dev(int dev_index)
 				sdi->index, ctx->usb->bus,
 				ctx->usb->address, USB_INTERFACE);
 		} else {
-			sr_err("fx2lafw: failed to open device: %d", err);
+			sr_err("fx2lafw: failed to open device: %d", ret);
 		}
 
 		/* if we made it here, we handled the device one way or another */
@@ -251,10 +263,10 @@ static int hw_init(const char *deviceinfo)
 {
 	struct sr_dev_inst *sdi;
 	struct libusb_device_descriptor des;
-	struct fx2lafw_profile *fx2lafw_prof;
+	const struct fx2lafw_profile *fx2lafw_prof;
 	struct context *ctx;
 	libusb_device **devlist;
-	int err;
+	int ret;
 	int devcnt = 0;
 	int i, j;
 
@@ -270,9 +282,9 @@ static int hw_init(const char *deviceinfo)
 	libusb_get_device_list(usb_context, &devlist);
 	for (i = 0; devlist[i]; i++) {
 
-		if ((err = libusb_get_device_descriptor(
+		if ((ret = libusb_get_device_descriptor(
 			devlist[i], &des)) != 0) {
-			sr_warn("failed to get device descriptor: %d", err);
+			sr_warn("failed to get device descriptor: %d", ret);
 			continue;
 		}
 
@@ -307,7 +319,8 @@ static int hw_init(const char *deviceinfo)
 			    (libusb_get_bus_number(devlist[i]),
 			     libusb_get_device_address(devlist[i]), NULL);
 		} else {
-			if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION, FIRMWARE) == SR_OK)
+			if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION,
+				fx2lafw_prof->firmware) == SR_OK)
 				/* Remember when the firmware on this device was updated */
 				g_get_current_time(&ctx->fw_updated);
 			else
@@ -329,7 +342,7 @@ static int hw_dev_open(int dev_index)
 	GTimeVal cur_time;
 	struct sr_dev_inst *sdi;
 	struct context *ctx;
-	int timediff, err;
+	int timediff, ret;
 
 	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
 		return SR_ERR;
@@ -339,14 +352,14 @@ static int hw_dev_open(int dev_index)
 	 * if the firmware was recently uploaded, wait up to MAX_RENUM_DELAY ms
 	 * for the FX2 to renumerate
 	 */
-	err = 0;
+	ret = 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 */
 		g_usleep(300 * 1000);
 		timediff = 0;
 		while (timediff < MAX_RENUM_DELAY) {
-			if ((err = fx2lafw_open_dev(dev_index)) == SR_OK)
+			if ((ret = fx2lafw_open_dev(dev_index)) == SR_OK)
 				break;
 			g_usleep(100 * 1000);
 			g_get_current_time(&cur_time);
@@ -354,21 +367,28 @@ static int hw_dev_open(int dev_index)
 		}
 		sr_info("fx2lafw: device came back after %d ms", timediff);
 	} else {
-		err = fx2lafw_open_dev(dev_index);
+		ret = fx2lafw_open_dev(dev_index);
 	}
 
-	if (err != SR_OK) {
+	if (ret != SR_OK) {
 		sr_err("fx2lafw: unable to open device");
 		return SR_ERR;
 	}
 	ctx = sdi->priv;
 
-	err = libusb_claim_interface(ctx->usb->devhdl, USB_INTERFACE);
-	if (err != 0) {
-		sr_err("fx2lafw: Unable to claim interface: %d", err);
+	ret = libusb_claim_interface(ctx->usb->devhdl, USB_INTERFACE);
+	if (ret != 0) {
+		sr_err("fx2lafw: Unable to claim interface: %d", ret);
 		return SR_ERR;
 	}
 
+	if (ctx->cur_samplerate == 0) {
+		/* Samplerate hasn't been set; default to the slowest one. */
+		if (hw_dev_config_set(dev_index, SR_HWCAP_SAMPLERATE,
+		    &fx2lafw_supported_samplerates[0]) == SR_ERR)
+			return SR_ERR;
+	}
+
 	return SR_OK;
 }
 
@@ -598,7 +618,7 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 	struct context *ctx;
 	struct libusb_transfer *transfer;
 	const struct libusb_pollfd **lupfd;
-	int err, size, i;
+	int ret, size, i;
 	unsigned char *buf;
 
 	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
@@ -617,10 +637,6 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 		return SR_ERR_MALLOC;
 	}
 
-	if ((err = command_start_acquisition (ctx->usb->devhdl)) != SR_OK) {
-		return err;
-	}
-
 	/* Start with 2K transfer, subsequently increased to 4K. */
 	size = 2048;
 	for (i = 0; i < NUM_SIMUL_TRANSFERS; i++) {
@@ -657,6 +673,11 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 	g_free(header);
 	g_free(packet);
 
+	if ((ret = command_start_acquisition (ctx->usb->devhdl,
+		ctx->cur_samplerate)) != SR_OK) {
+		return ret;
+	}
+
 	return SR_OK;
 }