X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffx2lafw%2Fprotocol.c;h=8e69b77fd545eb38641d1fe34252cd6b182c16e0;hb=b02bb45f4cf6378520e5a5b82ff39013cfa270b6;hp=5113462931d7fe46f0e9326c187be0e2b7ab2634;hpb=41dc2547787ea571e1f0fb271eff964767c49203;p=libsigrok.git

diff --git a/src/hardware/fx2lafw/protocol.c b/src/hardware/fx2lafw/protocol.c
index 51134629..8e69b77f 100644
--- a/src/hardware/fx2lafw/protocol.c
+++ b/src/hardware/fx2lafw/protocol.c
@@ -307,6 +307,7 @@ SR_PRIV struct dev_context *fx2lafw_dev_new(void)
 	devc->capture_ratio = 0;
 	devc->sample_wide = FALSE;
 	devc->dslogic_continuous_mode = FALSE;
+	devc->dslogic_clock_edge = DS_EDGE_RISING;
 	devc->stl = NULL;
 
 	return devc;
@@ -330,7 +331,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);
 
@@ -516,25 +517,25 @@ SR_PRIV void LIBUSB_CALL fx2lafw_receive_transfer(struct libusb_transfer *transf
 			else
 				num_samples = cur_sample_count;
 
-			if(devc->dslogic && devc->trigger_pos > devc->sent_samples
-				&& devc->trigger_pos <= devc->sent_samples + num_samples){
-					/* dslogic trigger in this block. Send trigger position */
+			if (devc->dslogic && devc->trigger_pos > devc->sent_samples
+				&& devc->trigger_pos <= devc->sent_samples + num_samples) {
+					/* DSLogic trigger in this block. Send trigger position. */
 					trigger_offset = devc->trigger_pos - devc->sent_samples;
-					/* pre-trigger samples */
+					/* Pre-trigger samples. */
 					devc->send_data_proc(sdi, (uint8_t *)transfer->buffer,
 						trigger_offset * unitsize, unitsize);
 					devc->sent_samples += trigger_offset;
-					/* trigger position */
+					/* Trigger position. */
 					devc->trigger_pos = 0;
 					packet.type = SR_DF_TRIGGER;
 					packet.payload = NULL;
 					sr_session_send(sdi, &packet);
-					/* post trigger samples */
+					/* Post trigger samples. */
 					num_samples -= trigger_offset;
 					devc->send_data_proc(sdi, (uint8_t *)transfer->buffer
-							+ trigger_offset * unitsize,	num_samples * unitsize, unitsize);
+							+ trigger_offset * unitsize, num_samples * unitsize, unitsize);
 					devc->sent_samples += num_samples;
-			}else{
+			} else {
 				devc->send_data_proc(sdi, (uint8_t *)transfer->buffer,
 					num_samples * unitsize, unitsize);
 				devc->sent_samples += num_samples;