WIP

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

diff --git a/hardware/fx2lafw/protocol.h b/hardware/fx2lafw/protocol.h
index 76ef63d57d7eeda8bd9e5b4dd739e1338a10279b..dc1c83ff62098f2895737b20c0c6eaad7df84e52 100644 (file)
--- a/hardware/fx2lafw/protocol.h
+++ b/hardware/fx2lafw/protocol.h
@@ -29,14 +29,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "fx2lafw: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "fx2lafw"
 
 #define USB_INTERFACE          0
 #define USB_CONFIGURATION      1
@@ -55,9 +48,6 @@
 /* 6 delay states of up to 256 clock ticks */
 #define MAX_SAMPLE_DELAY       (6 * 256)
 
-/* Software trigger implementation: positive values indicate trigger stage. */
-#define TRIGGER_FIRED          -1
-
 #define DEV_CAPS_16BIT_POS     0
 
 #define DEV_CAPS_16BIT         (1 << DEV_CAPS_16BIT_POS)
@@ -90,13 +80,15 @@ struct dev_context {
        uint64_t limit_samples;
 
        /* Operational settings */
+       gboolean trigger_fired;
+       gboolean acq_aborted;
        gboolean sample_wide;
        uint16_t trigger_mask[NUM_TRIGGER_STAGES];
        uint16_t trigger_value[NUM_TRIGGER_STAGES];
-       int trigger_stage;
+       unsigned int trigger_stage;
        uint16_t trigger_buffer[NUM_TRIGGER_STAGES];
 
-       int num_samples;
+       unsigned int sent_samples;
        int submitted_transfers;
        int empty_transfer_count;
 
@@ -110,7 +102,7 @@ SR_PRIV int fx2lafw_command_start_acquisition(libusb_device_handle *devhdl,
                uint64_t samplerate, gboolean samplewide);
 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_probes(const struct sr_dev_inst *sdi);
+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);