X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fsaleae-logic16%2Fprotocol.c;h=ce8db37f169c6a5b03dc495c6da3081775aeb3af;hp=4cdc28f3f652fbe1e88086bb0f2f4638bd2db25d;hb=HEAD;hpb=8cb222e1438c984184d9546fc374678aa9341bbb

diff --git a/src/hardware/saleae-logic16/protocol.c b/src/hardware/saleae-logic16/protocol.c
index 4cdc28f3..ce8db37f 100644
--- a/src/hardware/saleae-logic16/protocol.c
+++ b/src/hardware/saleae-logic16/protocol.c
@@ -35,11 +35,7 @@
 #define FPGA_FIRMWARE_33	"saleae-logic16-fpga-33.bitstream"
 
 #define MAX_SAMPLE_RATE		SR_MHZ(100)
-#define MAX_4CH_SAMPLE_RATE	SR_MHZ(50)
-#define MAX_7CH_SAMPLE_RATE	SR_MHZ(40)
-#define MAX_8CH_SAMPLE_RATE	SR_MHZ(32)
-#define MAX_10CH_SAMPLE_RATE	SR_MHZ(25)
-#define MAX_13CH_SAMPLE_RATE	SR_MHZ(16)
+#define MAX_SAMPLE_RATE_X_CH	SR_MHZ(300)
 
 #define BASE_CLOCK_0_FREQ	SR_MHZ(100)
 #define BASE_CLOCK_1_FREQ	SR_MHZ(160)
@@ -432,8 +428,7 @@ static int prime_fpga(const struct sr_dev_inst *sdi)
 		return ret;
 
 	if (version != 0x10 && version != 0x13 && version != 0x40 && version != 0x41) {
-		sr_err("Unsupported FPGA version: 0x%02x.", version);
-		return SR_ERR;
+		sr_warn("Unsupported FPGA version: 0x%02x.", version);
 	}
 
 	return SR_OK;
@@ -596,11 +591,7 @@ SR_PRIV int logic16_setup_acquisition(const struct sr_dev_inst *sdi,
 		if (channels & (1U << i))
 			nchan++;
 
-	if ((nchan >= 13 && samplerate > MAX_13CH_SAMPLE_RATE) ||
-	    (nchan >= 10 && samplerate > MAX_10CH_SAMPLE_RATE) ||
-	    (nchan >= 8  && samplerate > MAX_8CH_SAMPLE_RATE) ||
-	    (nchan >= 7  && samplerate > MAX_7CH_SAMPLE_RATE) ||
-	    (nchan >= 4  && samplerate > MAX_4CH_SAMPLE_RATE)) {
+	if (nchan * samplerate > MAX_SAMPLE_RATE_X_CH) {
 		sr_err("Unable to sample at %" PRIu64 "Hz "
 		       "with this many channels.", samplerate);
 		return SR_ERR;
@@ -761,7 +752,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);
 
@@ -921,47 +912,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);
 }