X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffx2lafw%2Fprotocol.h;h=24f17a9c8da054a4ea96c0a21a69bbb86b9a5b13;hb=8256ed15c605db4f472f928dc67e9734947e0ab9;hp=54b2f97df9b3ea980b87520c01d26a5711bb798e;hpb=4237fbcaac84160a04333244ba0a309b952d3a8f;p=libsigrok.git

diff --git a/src/hardware/fx2lafw/protocol.h b/src/hardware/fx2lafw/protocol.h
index 54b2f97d..24f17a9c 100644
--- a/src/hardware/fx2lafw/protocol.h
+++ b/src/hardware/fx2lafw/protocol.h
@@ -51,11 +51,14 @@
 
 #define DEV_CAPS_16BIT_POS	0
 #define DEV_CAPS_AX_ANALOG_POS	1
+#define DEV_CAPS_DSLOGIC_FW_POS 2
 
 #define DEV_CAPS_16BIT		(1 << DEV_CAPS_16BIT_POS)
 #define DEV_CAPS_AX_ANALOG	(1 << DEV_CAPS_AX_ANALOG_POS)
+#define DEV_CAPS_DSLOGIC_FW	(1 << DEV_CAPS_DSLOGIC_FW_POS)
 
-#define DSLOGIC_FPGA_FIRMWARE "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"
 
@@ -94,7 +97,6 @@ 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
@@ -134,7 +136,10 @@ struct dev_context {
 	gboolean dslogic;
 	uint16_t dslogic_mode;
 	uint32_t trigger_pos;
-	int dslogic_external_clock;
+	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);