fx2lafw: Drop unused devc->ch_enabled.

[libsigrok.git] / src / hardware / fx2lafw / protocol.h

diff --git a/src/hardware/fx2lafw/protocol.h b/src/hardware/fx2lafw/protocol.h
index 4c2f65f1f490608ec2e4ee308a825231a360963e..e228c87518371b47def45e60b71129ebb3223dcc 100644 (file)
--- a/src/hardware/fx2lafw/protocol.h
+++ b/src/hardware/fx2lafw/protocol.h
@@ -55,7 +55,8 @@
 #define DEV_CAPS_16BIT         (1 << DEV_CAPS_16BIT_POS)
 #define DEV_CAPS_AX_ANALOG     (1 << DEV_CAPS_AX_ANALOG_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 +95,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
@@ -122,11 +122,10 @@ 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 dev_context *devc,
+       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;
@@ -134,8 +133,11 @@ struct dev_context {
        /* Is this a DSLogic? */
        gboolean dslogic;
        uint16_t dslogic_mode;
-       int dslogic_external_clock;
-       gboolean trigger_en;
+       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);
@@ -148,9 +150,9 @@ SR_PRIV void LIBUSB_CALL fx2lafw_receive_transfer(struct libusb_transfer *transf
 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 dev_context *devc, uint8_t *data, size_t length,
-               size_t sample_width);
-SR_PRIV void mso_send_data_proc(struct dev_context *devc, uint8_t *data, size_t length,
-               size_t sample_width);
+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);
 
 #endif