X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffx2lafw%2Fprotocol.c;h=513fd0e2821f8fe039b45b4e58a33423ea152ac0;hb=3be42bc22f8b36599a448273c12a76d3e0f7a940;hp=6681b9efd67885009973fc7dcfad9a9e954b21ff;hpb=4df5739a9f4272e57d737dc3a957b2f723bbaad1;p=libsigrok.git

diff --git a/src/hardware/fx2lafw/protocol.c b/src/hardware/fx2lafw/protocol.c
index 6681b9ef..513fd0e2 100644
--- a/src/hardware/fx2lafw/protocol.c
+++ b/src/hardware/fx2lafw/protocol.c
@@ -18,6 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <glib.h>
 #include <glib/gstdio.h>
 #include "protocol.h"
@@ -124,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 |
@@ -156,8 +159,7 @@ SR_PRIV gboolean match_manuf_prod(libusb_device *dev, const char *manufacturer,
 	ret = FALSE;
 	while (!ret) {
 		/* Assume the FW has not been loaded, unless proven wrong. */
-		if (libusb_get_device_descriptor(dev, &des) != 0)
-			break;
+		libusb_get_device_descriptor(dev, &des);
 
 		if (libusb_open(dev, &hdl) != 0)
 			break;
@@ -194,7 +196,7 @@ SR_PRIV int fx2lafw_dev_open(struct sr_dev_inst *sdi, struct sr_dev_driver *di)
 	uint8_t revid;
 	char connection_id[64];
 
-	drvc = di->priv;
+	drvc = di->context;
 	devc = sdi->priv;
 	usb = sdi->conn;
 
@@ -210,11 +212,7 @@ SR_PRIV int fx2lafw_dev_open(struct sr_dev_inst *sdi, struct sr_dev_driver *di)
 	}
 
 	for (i = 0; i < device_count; i++) {
-		if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
-			sr_err("Failed to get device descriptor: %s.",
-			       libusb_error_name(ret));
-			continue;
-		}
+		libusb_get_device_descriptor(devlist[i], &des);
 
 		if (des.idVendor != devc->profile->vid
 		    || des.idProduct != devc->profile->pid)
@@ -244,6 +242,16 @@ SR_PRIV int fx2lafw_dev_open(struct sr_dev_inst *sdi, struct sr_dev_driver *di)
 			break;
 		}
 
+		if (libusb_has_capability(LIBUSB_CAP_SUPPORTS_DETACH_KERNEL_DRIVER)) {
+			if (libusb_kernel_driver_active(usb->devhdl, USB_INTERFACE) == 1) {
+				if ((ret = libusb_detach_kernel_driver(usb->devhdl, USB_INTERFACE)) < 0) {
+					sr_err("Failed to detach kernel driver: %s.",
+						libusb_error_name(ret));
+					return SR_ERR;
+				}
+			}
+		}
+
 		ret = command_get_fw_version(usb->devhdl, &vi);
 		if (ret != SR_OK) {
 			sr_err("Failed to get firmware version.");
@@ -298,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;
@@ -317,14 +326,11 @@ SR_PRIV void fx2lafw_abort_acquisition(struct dev_context *devc)
 
 static void finish_acquisition(struct sr_dev_inst *sdi)
 {
-	struct sr_datafeed_packet packet;
 	struct dev_context *devc;
 
 	devc = sdi->priv;
 
-	/* Terminate session. */
-	packet.type = SR_DF_END;
-	sr_session_send(sdi, &packet);
+	std_session_send_df_end(sdi, LOG_PREFIX);
 
 	/* Remove fds from polling. */
 	usb_source_remove(sdi->session, devc->ctx);
@@ -332,6 +338,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;
@@ -375,13 +385,71 @@ static void resubmit_transfer(struct libusb_transfer *transfer)
 
 }
 
-SR_PRIV void fx2lafw_receive_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;
@@ -434,20 +502,20 @@ SR_PRIV void fx2lafw_receive_transfer(struct libusb_transfer *transfer)
 	} 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 {
@@ -455,16 +523,15 @@ SR_PRIV void fx2lafw_receive_transfer(struct libusb_transfer *transfer)
 			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;