X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fsaleae-logic16%2Fprotocol.c;h=8b430d90c01e91e5d62ce2c87af853faaa19376f;hb=a4e435eb49c1fa30c31d5851b404001324cafe33;hp=c7ff20c4379d12db148be9fdb9d2dbe587aa0d40;hpb=6c60facc190a03c50aa66d4b1d17c825fec5d20e;p=libsigrok.git

diff --git a/hardware/saleae-logic16/protocol.c b/hardware/saleae-logic16/protocol.c
index c7ff20c4..8b430d90 100644
--- a/hardware/saleae-logic16/protocol.c
+++ b/hardware/saleae-logic16/protocol.c
@@ -590,6 +590,10 @@ static void finish_acquisition(struct dev_context *devc)
 	devc->num_transfers = 0;
 	g_free(devc->transfers);
 	g_free(devc->convbuffer);
+	if (devc->stl) {
+		soft_trigger_logic_free(devc->stl);
+		devc->stl = NULL;
+	}
 }
 
 static void free_transfer(struct libusb_transfer *transfer)
@@ -629,8 +633,7 @@ static void resubmit_transfer(struct libusb_transfer *transfer)
 }
 
 static size_t convert_sample_data(struct dev_context *devc,
-				  uint8_t *dest, size_t destcnt,
-				  const uint8_t *src, size_t srccnt)
+		uint8_t *dest, size_t destcnt, const uint8_t *src, size_t srccnt)
 {
 	uint16_t *channel_data;
 	int i, cur_channel;
@@ -661,7 +664,7 @@ static size_t convert_sample_data(struct dev_context *devc,
 			memcpy(dest, channel_data, 16 * 2);
 			memset(channel_data, 0, 16 * 2);
 			dest += 16 * 2;
-			ret += 16 * 2;
+			ret += 16;
 			destcnt -= 16 * 2;
 		}
 	}
@@ -677,7 +680,8 @@ SR_PRIV void logic16_receive_transfer(struct libusb_transfer *transfer)
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_logic logic;
 	struct dev_context *devc;
-	size_t converted_length;
+	size_t new_samples, num_samples;
+	int trigger_offset;
 
 	devc = transfer->user_data;
 
@@ -685,7 +689,7 @@ SR_PRIV void logic16_receive_transfer(struct libusb_transfer *transfer)
 	 * If acquisition has already ended, just free any queued up
 	 * transfer that come in.
 	 */
-	if (devc->num_samples < 0) {
+	if (devc->sent_samples < 0) {
 		free_transfer(transfer);
 		return;
 	}
@@ -695,7 +699,7 @@ SR_PRIV void logic16_receive_transfer(struct libusb_transfer *transfer)
 
 	switch (transfer->status) {
 	case LIBUSB_TRANSFER_NO_DEVICE:
-		devc->num_samples = -2;
+		devc->sent_samples = -2;
 		free_transfer(transfer);
 		return;
 	case LIBUSB_TRANSFER_COMPLETED:
@@ -721,7 +725,7 @@ SR_PRIV void logic16_receive_transfer(struct libusb_transfer *transfer)
 			 * The FX2 gave up. End the acquisition, the frontend
 			 * will work out that the samplecount is short.
 			 */
-			devc->num_samples = -2;
+			devc->sent_samples = -2;
 			free_transfer(transfer);
 		} else {
 			resubmit_transfer(transfer);
@@ -731,23 +735,45 @@ SR_PRIV void logic16_receive_transfer(struct libusb_transfer *transfer)
 		devc->empty_transfer_count = 0;
 	}
 
-	converted_length = convert_sample_data(devc, devc->convbuffer,
-				devc->convbuffer_size, transfer->buffer,
-				transfer->actual_length);
-
-	if (converted_length > 0) {
-		/* Send the incoming transfer to the session bus. */
-		packet.type = SR_DF_LOGIC;
-		packet.payload = &logic;
-		logic.length = converted_length;
-		logic.unitsize = 2;
-		logic.data = devc->convbuffer;
-		sr_session_send(devc->cb_data, &packet);
+	new_samples = convert_sample_data(devc, devc->convbuffer,
+			devc->convbuffer_size, transfer->buffer, transfer->actual_length);
+
+	if (new_samples > 0) {
+		if (devc->trigger_fired) {
+			/* Send the incoming transfer to the session bus. */
+			packet.type = SR_DF_LOGIC;
+			packet.payload = &logic;
+			if (devc->limit_samples &&
+					new_samples > devc->limit_samples - devc->sent_samples)
+				new_samples = devc->limit_samples - devc->sent_samples;
+			logic.length = new_samples * 2;
+			logic.unitsize = 2;
+			logic.data = devc->convbuffer;
+			sr_session_send(devc->cb_data, &packet);
+			devc->sent_samples += new_samples;
+		} else {
+			trigger_offset = soft_trigger_logic_check(devc->stl,
+					devc->convbuffer, new_samples * 2);
+			if (trigger_offset > -1) {
+				packet.type = SR_DF_LOGIC;
+				packet.payload = &logic;
+				num_samples = new_samples - trigger_offset;
+				if (devc->limit_samples &&
+						num_samples > devc->limit_samples - devc->sent_samples)
+					num_samples = devc->limit_samples - devc->sent_samples;
+				logic.length = num_samples * 2;
+				logic.unitsize = 2;
+				logic.data = devc->convbuffer + trigger_offset * 2;
+				sr_session_send(devc->cb_data, &packet);
+				devc->sent_samples += num_samples;
+
+				devc->trigger_fired = TRUE;
+			}
+		}
 
-		devc->num_samples += converted_length / 2;
 		if (devc->limit_samples &&
-		    (uint64_t)devc->num_samples > devc->limit_samples) {
-			devc->num_samples = -2;
+				(uint64_t)devc->sent_samples >= devc->limit_samples) {
+			devc->sent_samples = -2;
 			free_transfer(transfer);
 			return;
 		}