build: Portability fixes.

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

diff --git a/hardware/fx2lafw/protocol.h b/hardware/fx2lafw/protocol.h
index 08e2589946de6d0d6c6f53a8ae15598652b833ad..fef0dd76bb85f8ae730d4553fb9760b780ac625c 100644 (file)
--- a/hardware/fx2lafw/protocol.h
+++ b/hardware/fx2lafw/protocol.h
@@ -34,7 +34,6 @@
 #define USB_INTERFACE          0
 #define USB_CONFIGURATION      1
 #define NUM_TRIGGER_STAGES     4
-#define TRIGGER_TYPE           "01"
 
 #define MAX_RENUM_DELAY_MS     3000
 #define NUM_SIMUL_TRANSFERS    32
@@ -63,6 +62,9 @@ struct fx2lafw_profile {
        const char *firmware;
 
        uint32_t dev_caps;
+
+       const char *usb_manufacturer;
+       const char *usb_product;
 };
 
 struct dev_context {
@@ -83,10 +85,7 @@ struct dev_context {
        gboolean trigger_fired;
        gboolean acq_aborted;
        gboolean sample_wide;
-       uint16_t trigger_mask[NUM_TRIGGER_STAGES];
-       uint16_t trigger_value[NUM_TRIGGER_STAGES];
-       unsigned int trigger_stage;
-       uint16_t trigger_buffer[NUM_TRIGGER_STAGES];
+       struct soft_trigger_logic *stl;
 
        unsigned int sent_samples;
        int submitted_transfers;
@@ -101,7 +100,6 @@ struct dev_context {
 SR_PRIV int fx2lafw_command_start_acquisition(const struct sr_dev_inst *sdi);
 SR_PRIV gboolean fx2lafw_check_conf_profile(libusb_device *dev);
 SR_PRIV int fx2lafw_dev_open(struct sr_dev_inst *sdi, struct sr_dev_driver *di);
-SR_PRIV int fx2lafw_configure_channels(const struct sr_dev_inst *sdi);
 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);