X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffx2lafw%2Ffx2lafw.c;h=88641163520b54adbabdca5b685f8afe5e1098f8;hb=17b6c75a899bb5fb2b8b841b60e3e9fb52ca3e30;hp=9cc97f21d1dcdaf30ab579018c2837159cbd77f2;hpb=e318664793525543f7001371aee8cad79102266d;p=libsigrok.git

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index 9cc97f21..88641163 100644
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -26,9 +26,12 @@
 #include "sigrok.h"
 #include "sigrok-internal.h"
 #include "fx2lafw.h"
+#include "command.h"
 
 static struct fx2lafw_profile supported_fx2[] = {
-	/* USBee AX */
+	/* CWAV USBee AX
+	 * EE Electronics ESLA201A
+	 */
 	{ 0x08a9, 0x0014, "CWAV", "USBee AX", NULL, 8 },
 	{ 0, 0, 0, 0, 0, 0 }
 };
@@ -77,6 +80,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);
 
 /**
@@ -115,18 +119,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... */
@@ -165,8 +164,8 @@ static int fx2lafw_open_dev(int dev_index)
 			continue;
 		}
 
-		if (des.idVendor != FIRMWARE_VID
-		    || des.idProduct != FIRMWARE_PID)
+		if (des.idVendor != ctx->profile->vid
+		    || des.idProduct != ctx->profile->pid)
 			continue;
 
 		if (sdi->status == SR_ST_INITIALIZING) {
@@ -368,6 +367,13 @@ static int hw_dev_open(int dev_index)
 		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;
 }
 
@@ -505,26 +511,33 @@ static int receive_data(int fd, int revents, void *cb_data)
 	return TRUE;
 }
 
+static void abort_acquisition(struct context *ctx)
+{
+	struct sr_datafeed_packet packet;
+
+	packet.type = SR_DF_END;
+	sr_session_send(ctx->session_dev_id, &packet);
+
+	ctx->num_samples = -1;
+
+	/* TODO: Need to cancel and free any queued up transfers. */
+}
+
 static void receive_transfer(struct libusb_transfer *transfer)
 {
 	/* TODO: These statics have to move to the ctx struct. */
-	static int num_samples = 0;
 	static int empty_transfer_count = 0;
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_logic logic;
-	struct context *ctx;
+	struct context *ctx = transfer->user_data;
 	int cur_buflen;
 	unsigned char *cur_buf, *new_buf;
 
-	/* hw_dev_acquisition_stop() is telling us to stop. */
-	if (transfer == NULL)
-		num_samples = -1;
-
 	/*
 	 * If acquisition has already ended, just free any queued up
 	 * transfer that come in.
 	 */
-	if (num_samples == -1) {
+	if (ctx->num_samples == -1) {
 		if (transfer)
 			libusb_free_transfer(transfer);
 		return;
@@ -559,7 +572,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
 			 * The FX2 gave up. End the acquisition, the frontend
 			 * will work out that the samplecount is short.
 			 */
-			hw_dev_acquisition_stop(-1, ctx->session_dev_id);
+			abort_acquisition(ctx);
 		}
 		return;
 	} else {
@@ -575,10 +588,10 @@ static void receive_transfer(struct libusb_transfer *transfer)
 	sr_session_send(ctx->session_dev_id, &packet);
 	g_free(cur_buf);
 
-	num_samples += cur_buflen;
+	ctx->num_samples += cur_buflen;
 	if (ctx->limit_samples &&
-		(unsigned int) num_samples > ctx->limit_samples) {
-		hw_dev_acquisition_stop(-1, ctx->session_dev_id);
+		(unsigned int) ctx->num_samples > ctx->limit_samples) {
+		abort_acquisition(ctx);
 	}
 }
 
@@ -590,13 +603,14 @@ 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 size, i;
+	int err, size, i;
 	unsigned char *buf;
 
 	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
 		return SR_ERR;
 	ctx = sdi->priv;
 	ctx->session_dev_id = cb_data;
+	ctx->num_samples = 0;
 
 	if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) {
 		sr_err("fx2lafw: %s: packet malloc failed", __func__);
@@ -644,23 +658,26 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 	g_free(header);
 	g_free(packet);
 
+	if ((err = command_start_acquisition (ctx->usb->devhdl,
+		ctx->cur_samplerate)) != SR_OK) {
+		return err;
+	}
+
 	return SR_OK;
 }
 
 /* TODO: This stops acquisition on ALL devices, ignoring dev_index. */
 static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
 {
-	struct sr_datafeed_packet packet;
-
-	/* Avoid compiler warnings. */
-	(void)dev_index;
-
-	packet.type = SR_DF_END;
-	sr_session_send(cb_data, &packet);
+	struct sr_dev_inst *sdi;
 
-	receive_transfer(NULL);
+	/* unused parameter */
+	(void)cb_data;
 
-	/* TODO: Need to cancel and free any queued up transfers. */
+	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+		return SR_ERR;
+ 
+	abort_acquisition(sdi->priv);
 
 	return SR_OK;
 }