X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffx2lafw%2Fprotocol.c;h=e2112af13abc6d96a0f1893f60451d0e04e22d72;hb=42be2adb5ab329a0b22d9df392d8eca84d5d9acf;hp=d267ad5b0d84ff5ca17b73c442edc0b825c4b9ec;hpb=8cb222e1438c984184d9546fc374678aa9341bbb;p=libsigrok.git

diff --git a/src/hardware/fx2lafw/protocol.c b/src/hardware/fx2lafw/protocol.c
index d267ad5b..e2112af1 100644
--- a/src/hardware/fx2lafw/protocol.c
+++ b/src/hardware/fx2lafw/protocol.c
@@ -126,7 +126,7 @@ SR_PRIV int fx2lafw_command_start_acquisition(const struct sr_dev_inst *sdi)
 	cmd.flags |= devc->sample_wide ? CMD_START_FLAGS_SAMPLE_16BIT :
 		CMD_START_FLAGS_SAMPLE_8BIT;
 	/* Enable CTL2 clock. */
-	cmd.flags |= (devc->profile->dev_caps & DEV_CAPS_AX_ANALOG) ? CMD_START_FLAGS_CLK_CTL2 : 0;
+	cmd.flags |= (g_slist_length(devc->enabled_analog_channels) > 0) ? CMD_START_FLAGS_CLK_CTL2 : 0;
 
 	/* Send the control message. */
 	ret = libusb_control_transfer(usb->devhdl, LIBUSB_REQUEST_TYPE_VENDOR |
@@ -306,7 +306,8 @@ SR_PRIV struct dev_context *fx2lafw_dev_new(void)
 	devc->limit_samples = 0;
 	devc->capture_ratio = 0;
 	devc->sample_wide = FALSE;
-	devc->trigger_en = FALSE;
+	devc->dslogic_continuous_mode = FALSE;
+	devc->dslogic_clock_edge = DS_EDGE_RISING;
 	devc->stl = NULL;
 
 	return devc;
@@ -330,16 +331,18 @@ 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);
 
 	devc->num_transfers = 0;
 	g_free(devc->transfers);
 
-	/* Free the deinterlace buffers if we had them */
-	g_free(devc->logic_buffer);
-	g_free(devc->analog_buffer);
+	/* Free the deinterlace buffers if we had them. */
+	if (g_slist_length(devc->enabled_analog_channels) > 0) {
+		g_free(devc->logic_buffer);
+		g_free(devc->analog_buffer);
+	}
 
 	if (devc->stl) {
 		soft_trigger_logic_free(devc->stl);
@@ -389,17 +392,22 @@ SR_PRIV void mso_send_data_proc(struct sr_dev_inst *sdi,
 {
 	size_t i;
 	struct dev_context *devc;
+	struct sr_datafeed_analog analog;
+	struct sr_analog_encoding encoding;
+	struct sr_analog_meaning meaning;
+	struct sr_analog_spec spec;
+
+	(void)sample_width;
 
 	devc = sdi->priv;
 
-	sample_width = sample_width;
 	length /= 2;
 
 	/* Send the logic */
 	for (i = 0; i < length; i++) {
-		devc->logic_buffer[i]  = data[i * 2];
+		devc->logic_buffer[i] = data[i * 2];
 		/* Rescale to -10V - +10V from 0-255. */
-		devc->analog_buffer[i] = data[i * 2 + 1] - 128.0f / 12.8f;
+		devc->analog_buffer[i] = (data[i * 2 + 1] - 128.0f) / 12.8f;
 	};
 
 	const struct sr_datafeed_logic logic = {
@@ -415,17 +423,16 @@ SR_PRIV void mso_send_data_proc(struct sr_dev_inst *sdi,
 
 	sr_session_send(sdi, &logic_packet);
 
-	const struct sr_datafeed_analog_old analog = {
-		.channels = devc->enabled_analog_channels,
-		.num_samples = length,
-		.mq = SR_MQ_VOLTAGE,
-		.unit = SR_UNIT_VOLT,
-		.mqflags = 0 /*SR_MQFLAG_DC*/,
-		.data = devc->analog_buffer
-	};
+	sr_analog_init(&analog, &encoding, &meaning, &spec, 2);
+	analog.meaning->channels = devc->enabled_analog_channels;
+	analog.meaning->mq = SR_MQ_VOLTAGE;
+	analog.meaning->unit = SR_UNIT_VOLT;
+	analog.meaning->mqflags = 0 /* SR_MQFLAG_DC */;
+	analog.num_samples = length;
+	analog.data = devc->analog_buffer;
 
 	const struct sr_datafeed_packet analog_packet = {
-		.type = SR_DF_ANALOG_OLD,
+		.type = SR_DF_ANALOG,
 		.payload = &analog
 	};
 
@@ -454,6 +461,7 @@ SR_PRIV void LIBUSB_CALL fx2lafw_receive_transfer(struct libusb_transfer *transf
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
 	gboolean packet_has_error = FALSE;
+	struct sr_datafeed_packet packet;
 	unsigned int num_samples;
 	int trigger_offset, cur_sample_count, unitsize;
 	int pre_trigger_samples;
@@ -506,8 +514,6 @@ SR_PRIV void LIBUSB_CALL fx2lafw_receive_transfer(struct libusb_transfer *transf
 	} else {
 		devc->empty_transfer_count = 0;
 	}
-	if (devc->trigger_en)
-		devc->trigger_fired = TRUE;
 	if (devc->trigger_fired) {
 		if (!devc->limit_samples || devc->sent_samples < devc->limit_samples) {
 			/* Send the incoming transfer to the session bus. */
@@ -516,9 +522,29 @@ SR_PRIV void LIBUSB_CALL fx2lafw_receive_transfer(struct libusb_transfer *transf
 			else
 				num_samples = cur_sample_count;
 
-			devc->send_data_proc(sdi, (uint8_t *)transfer->buffer,
-				num_samples * unitsize, unitsize);
-			devc->sent_samples += num_samples;
+			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. */
+					devc->send_data_proc(sdi, (uint8_t *)transfer->buffer,
+						trigger_offset * unitsize, unitsize);
+					devc->sent_samples += trigger_offset;
+					/* Trigger position. */
+					devc->trigger_pos = 0;
+					packet.type = SR_DF_TRIGGER;
+					packet.payload = NULL;
+					sr_session_send(sdi, &packet);
+					/* Post trigger samples. */
+					num_samples -= trigger_offset;
+					devc->send_data_proc(sdi, (uint8_t *)transfer->buffer
+							+ trigger_offset * unitsize, num_samples * unitsize, unitsize);
+					devc->sent_samples += num_samples;
+			} else {
+				devc->send_data_proc(sdi, (uint8_t *)transfer->buffer,
+					num_samples * unitsize, unitsize);
+				devc->sent_samples += num_samples;
+			}
 		}
 	} else {
 		trigger_offset = soft_trigger_logic_check(devc->stl,