X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffx2lafw%2Fprotocol.c;h=fce69ac486fa6c5e101d9927331f9c391639d8f5;hb=7fb90f94d62597224509472906fd8a33c3f3a1d2;hp=12fc9e2c061166405b494ad813c6c704d146d1fe;hpb=2a8f2d41adcd0aa9e498c4eea2a5f82263039e5c;p=libsigrok.git

diff --git a/src/hardware/fx2lafw/protocol.c b/src/hardware/fx2lafw/protocol.c
index 12fc9e2c..fce69ac4 100644
--- a/src/hardware/fx2lafw/protocol.c
+++ b/src/hardware/fx2lafw/protocol.c
@@ -125,6 +125,8 @@ SR_PRIV int fx2lafw_command_start_acquisition(const struct sr_dev_inst *sdi)
 	/* Select the sampling width. */
 	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;
 
 	/* Send the control message. */
 	ret = libusb_control_transfer(usb->devhdl, LIBUSB_REQUEST_TYPE_VENDOR |
@@ -304,6 +306,7 @@ 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->stl = NULL;
 
 	return devc;
@@ -338,6 +341,10 @@ static void finish_acquisition(struct sr_dev_inst *sdi)
 	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);
+
 	if (devc->stl) {
 		soft_trigger_logic_free(devc->stl);
 		devc->stl = NULL;
@@ -381,13 +388,71 @@ static void resubmit_transfer(struct libusb_transfer *transfer)
 
 }
 
+SR_PRIV void mso_send_data_proc(struct dev_context *devc,
+	uint8_t *data, size_t length, size_t sample_width)
+{
+	size_t i;
+	sample_width = sample_width;
+	length /= 2;
+
+	/* Send the logic */
+	for(i = 0; i < length; i++) {
+		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;
+	};
+
+	const struct sr_datafeed_logic logic = {
+		.length = length,
+		.unitsize = 1,
+		.data = devc->logic_buffer
+	};
+
+	const struct sr_datafeed_packet logic_packet = {
+		.type = SR_DF_LOGIC,
+		.payload = &logic
+	};
+	sr_session_send(devc->cb_data, &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
+	};
+
+	const struct sr_datafeed_packet analog_packet = {
+		.type = SR_DF_ANALOG_OLD,
+		.payload = &analog
+	};
+	sr_session_send(devc->cb_data, &analog_packet);
+
+}
+
+SR_PRIV void la_send_data_proc(struct dev_context *devc,
+	uint8_t *data, size_t length, size_t sample_width)
+{
+	const struct sr_datafeed_logic logic = {
+		.length = length,
+		.unitsize = sample_width,
+		.data = data
+	};
+
+	const struct sr_datafeed_packet packet = {
+		.type = SR_DF_LOGIC,
+		.payload = &logic
+	};
+
+	sr_session_send(devc->cb_data, &packet);
+}
+
 SR_PRIV void LIBUSB_CALL fx2lafw_receive_transfer(struct libusb_transfer *transfer)
 {
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
 	gboolean packet_has_error = FALSE;
-	struct sr_datafeed_packet packet;
-	struct sr_datafeed_logic logic;
 	unsigned int num_samples;
 	int trigger_offset, cur_sample_count, unitsize;
 	int pre_trigger_samples;
@@ -440,20 +505,20 @@ 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. */
-			packet.type = SR_DF_LOGIC;
-			packet.payload = &logic;
 			if (devc->limit_samples && devc->sent_samples + cur_sample_count > devc->limit_samples)
 				num_samples = devc->limit_samples - devc->sent_samples;
 			else
 				num_samples = cur_sample_count;
-			logic.length = num_samples * unitsize;
-			logic.unitsize = unitsize;
-			logic.data = transfer->buffer;
-			sr_session_send(devc->cb_data, &packet);
+
+			devc->send_data_proc(devc,
+						(uint8_t*)transfer->buffer,
+						num_samples * unitsize,
+						unitsize);
 			devc->sent_samples += num_samples;
 		}
 	} else {
@@ -461,16 +526,15 @@ SR_PRIV void LIBUSB_CALL fx2lafw_receive_transfer(struct libusb_transfer *transf
 			transfer->buffer, transfer->actual_length, &pre_trigger_samples);
 		if (trigger_offset > -1) {
 			devc->sent_samples += pre_trigger_samples;
-			packet.type = SR_DF_LOGIC;
-			packet.payload = &logic;
 			num_samples = cur_sample_count - 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 * unitsize;
-			logic.unitsize = unitsize;
-			logic.data = transfer->buffer + trigger_offset * unitsize;
-			sr_session_send(devc->cb_data, &packet);
+
+			devc->send_data_proc(devc,
+						(uint8_t*)transfer->buffer + trigger_offset * unitsize,
+						num_samples * unitsize,
+						unitsize);
 			devc->sent_samples += num_samples;
 
 			devc->trigger_fired = TRUE;