X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffx2lafw%2Ffx2lafw.c;h=cb9963f52eac11389219968cc17570200dc264af;hb=dba024420f934ff10f18eebbaad1f4e97c739259;hp=5a40be92c0a831bcd43ec68e72be64c68874b73c;hpb=f6582cd7bf62bc945ecadda09123fde6c3676107;p=libsigrok.git

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index 5a40be92..cb9963f5 100644
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -78,6 +78,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);
 
 /**
@@ -369,6 +370,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;
 }
 
@@ -506,26 +514,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;
@@ -560,7 +575,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 {
@@ -576,10 +591,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);
 	}
 }
 
@@ -598,6 +613,7 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 		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__);
@@ -609,7 +625,8 @@ 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) {
+	if ((err = command_start_acquisition (ctx->usb->devhdl,
+		ctx->cur_samplerate)) != SR_OK) {
 		return err;
 	}
 
@@ -655,17 +672,15 @@ 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)
 {
-	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;
 }