X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fsaleae-logic16%2Fprotocol.c;h=a3dc0900f04fb8d6f63967ae592fc12b9ff336d4;hb=fa2ce8c762fb62cd632eb2a8b4f24128ca742678;hp=997a829a0190b6ce4de1213ec4790828f6ca99d1;hpb=cb193a209388c138922cc71e8e285ed300fe76f5;p=libsigrok.git

diff --git a/src/hardware/saleae-logic16/protocol.c b/src/hardware/saleae-logic16/protocol.c
index 997a829a..a3dc0900 100644
--- a/src/hardware/saleae-logic16/protocol.c
+++ b/src/hardware/saleae-logic16/protocol.c
@@ -753,7 +753,7 @@ static void finish_acquisition(struct sr_dev_inst *sdi)
 
 	devc = sdi->priv;
 
-	std_session_send_df_end(sdi, LOG_PREFIX);
+	std_session_send_df_end(sdi);
 
 	usb_source_remove(sdi->session, devc->ctx);
 
@@ -913,47 +913,51 @@ SR_PRIV void LIBUSB_CALL logic16_receive_transfer(struct libusb_transfer *transf
 	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. */
+	if (new_samples <= 0) {
+		resubmit_transfer(transfer);
+		return;
+	}
+
+	/* At least one new sample. */
+	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(sdi, &packet);
+		devc->sent_samples += new_samples;
+	} else {
+		trigger_offset = soft_trigger_logic_check(devc->stl,
+				devc->convbuffer, new_samples * 2, &pre_trigger_samples);
+		if (trigger_offset > -1) {
+			devc->sent_samples += pre_trigger_samples;
 			packet.type = SR_DF_LOGIC;
 			packet.payload = &logic;
+			num_samples = new_samples - trigger_offset;
 			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;
+					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;
+			logic.data = devc->convbuffer + trigger_offset * 2;
 			sr_session_send(sdi, &packet);
-			devc->sent_samples += new_samples;
-		} else {
-			trigger_offset = soft_trigger_logic_check(devc->stl,
-					devc->convbuffer, new_samples * 2, &pre_trigger_samples);
-			if (trigger_offset > -1) {
-				devc->sent_samples += pre_trigger_samples;
-				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(sdi, &packet);
-				devc->sent_samples += num_samples;
-
-				devc->trigger_fired = TRUE;
-			}
-		}
+			devc->sent_samples += num_samples;
 
-		if (devc->limit_samples &&
-				(uint64_t)devc->sent_samples >= devc->limit_samples) {
-			devc->sent_samples = -2;
-			free_transfer(transfer);
-			return;
+			devc->trigger_fired = TRUE;
 		}
 	}
 
+	if (devc->limit_samples &&
+			(uint64_t)devc->sent_samples >= devc->limit_samples) {
+		devc->sent_samples = -2;
+		free_transfer(transfer);
+		return;
+	}
+
 	resubmit_transfer(transfer);
 }