X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffx2lafw%2Fprotocol.h;h=a0d69c40e4b0e0fcdc4d7bffead17695f0547484;hb=d9a58763d66b761900fdc930d9cd580137ea3a5c;hp=f8c2f3e28046dabd8a30fb39fec0602cc17d3c36;hpb=a7d7f93c1ba6f08c243b894dda29b8ac0349bf10;p=libsigrok.git

diff --git a/src/hardware/fx2lafw/protocol.h b/src/hardware/fx2lafw/protocol.h
index f8c2f3e2..a0d69c40 100644
--- a/src/hardware/fx2lafw/protocol.h
+++ b/src/hardware/fx2lafw/protocol.h
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <libusb.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "fx2lafw"
@@ -39,6 +39,8 @@
 #define NUM_SIMUL_TRANSFERS	32
 #define MAX_EMPTY_TRANSFERS	(NUM_SIMUL_TRANSFERS * 2)
 
+#define NUM_CHANNELS		16
+
 #define FX2LAFW_REQUIRED_VERSION_MAJOR	1
 
 #define MAX_8BIT_SAMPLE_RATE	SR_MHZ(24)
@@ -48,34 +50,32 @@
 #define MAX_SAMPLE_DELAY	(6 * 256)
 
 #define DEV_CAPS_16BIT_POS	0
+#define DEV_CAPS_AX_ANALOG_POS	1
 
 #define DEV_CAPS_16BIT		(1 << DEV_CAPS_16BIT_POS)
+#define DEV_CAPS_AX_ANALOG	(1 << DEV_CAPS_AX_ANALOG_POS)
 
-#define DSLOGIC_FPGA_FIRMWARE FIRMWARE_DIR "/dreamsourcelab-dslogic-fpga.fw"
+#define DSLOGIC_FPGA_FIRMWARE_5V "dreamsourcelab-dslogic-fpga-5v.fw"
+#define DSLOGIC_FPGA_FIRMWARE_3V3 "dreamsourcelab-dslogic-fpga-3v3.fw"
+#define DSCOPE_FPGA_FIRMWARE "dreamsourcelab-dscope-fpga.fw"
+#define DSLOGIC_PRO_FPGA_FIRMWARE "dreamsourcelab-dslogic-pro-fpga.fw"
 
 /* Protocol commands */
 #define CMD_GET_FW_VERSION		0xb0
 #define CMD_START			0xb1
 #define CMD_GET_REVID_VERSION		0xb2
 
+#define CMD_START_FLAGS_CLK_CTL2_POS	4
 #define CMD_START_FLAGS_WIDE_POS	5
 #define CMD_START_FLAGS_CLK_SRC_POS	6
 
+#define CMD_START_FLAGS_CLK_CTL2	(1 << CMD_START_FLAGS_CLK_CTL2_POS)
 #define CMD_START_FLAGS_SAMPLE_8BIT	(0 << CMD_START_FLAGS_WIDE_POS)
 #define CMD_START_FLAGS_SAMPLE_16BIT	(1 << CMD_START_FLAGS_WIDE_POS)
 
 #define CMD_START_FLAGS_CLK_30MHZ	(0 << CMD_START_FLAGS_CLK_SRC_POS)
 #define CMD_START_FLAGS_CLK_48MHZ	(1 << CMD_START_FLAGS_CLK_SRC_POS)
 
-/* Modified protocol commands & flags used by DSLogic */
-#define CMD_DSLOGIC_GET_REVID_VERSION	0xb1
-#define CMD_DSLOGIC_START	0xb2
-#define CMD_DSLOGIC_CONFIG	0xb3
-#define CMD_DSLOGIC_SETTING	0xb4
-
-#define CMD_START_FLAGS_DSLOGIC_STOP_POS	7
-#define CMD_START_FLAGS_DSLOGIC_STOP (1 << CMD_START_FLAGS_DSLOGIC_STOP_POS)
-
 struct fx2lafw_profile {
 	uint16_t vid;
 	uint16_t pid;
@@ -94,6 +94,8 @@ struct fx2lafw_profile {
 
 struct dev_context {
 	const struct fx2lafw_profile *profile;
+	GSList *enabled_analog_channels;
+	gboolean ch_enabled[NUM_CHANNELS];
 	/*
 	 * Since we can't keep track of an fx2lafw device after upgrading
 	 * the firmware (it renumerates into a different device address
@@ -121,13 +123,22 @@ struct dev_context {
 	int submitted_transfers;
 	int empty_transfer_count;
 
-	void *cb_data;
 	unsigned int num_transfers;
 	struct libusb_transfer **transfers;
 	struct sr_context *ctx;
+	void (*send_data_proc)(struct sr_dev_inst *sdi,
+		uint8_t *data, size_t length, size_t sample_width);
+	uint8_t *logic_buffer;
+	float *analog_buffer;
 
 	/* Is this a DSLogic? */
 	gboolean dslogic;
+	uint16_t dslogic_mode;
+	uint32_t trigger_pos;
+	gboolean dslogic_external_clock;
+	gboolean dslogic_continuous_mode;
+	int dslogic_clock_edge;
+	int dslogic_voltage_threshold;
 };
 
 SR_PRIV int fx2lafw_command_start_acquisition(const struct sr_dev_inst *sdi);
@@ -136,11 +147,13 @@ SR_PRIV gboolean match_manuf_prod(libusb_device *dev, const char *manufacturer,
 SR_PRIV int fx2lafw_dev_open(struct sr_dev_inst *sdi, struct sr_dev_driver *di);
 SR_PRIV struct dev_context *fx2lafw_dev_new(void);
 SR_PRIV void fx2lafw_abort_acquisition(struct dev_context *devc);
-SR_PRIV void fx2lafw_receive_transfer(struct libusb_transfer *transfer);
+SR_PRIV void LIBUSB_CALL fx2lafw_receive_transfer(struct libusb_transfer *transfer);
 SR_PRIV size_t fx2lafw_get_buffer_size(struct dev_context *devc);
 SR_PRIV unsigned int fx2lafw_get_number_of_transfers(struct dev_context *devc);
 SR_PRIV unsigned int fx2lafw_get_timeout(struct dev_context *devc);
+SR_PRIV void la_send_data_proc(struct sr_dev_inst *sdi, uint8_t *data,
+		size_t length, size_t sample_width);
+SR_PRIV void mso_send_data_proc(struct sr_dev_inst *sdi, uint8_t *data,
+		size_t length, size_t sample_width);
 
-int dslogic_fpga_firmware_upload(struct libusb_device_handle *hdl,
-		const char *filename);
 #endif