X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffx2lafw%2Ffx2lafw.h;h=ae3ed1bc31753664ed9b8e345447ad56468db799;hb=5d9ed643e9dddbdb43e8917cff197346bdc930e7;hp=1a726cf63b39e5e202760f6e86b46996a91404d7;hpb=d1ddc7a9a8a7226fcb1f8b5a360c275684e77e9a;p=libsigrok.git diff --git a/hardware/fx2lafw/fx2lafw.h b/hardware/fx2lafw/fx2lafw.h index 1a726cf6..ae3ed1bc 100644 --- a/hardware/fx2lafw/fx2lafw.h +++ b/hardware/fx2lafw/fx2lafw.h @@ -19,7 +19,6 @@ */ #include -#include #ifndef LIBSIGROK_HARDWARE_FX2LAFW_FX2LAFW_H #define LIBSIGROK_HARDWARE_FX2LAFW_FX2LAFW_H @@ -35,6 +34,9 @@ #define FX2LAFW_REQUIRED_VERSION_MAJOR 1 +#define MAX_8BIT_SAMPLE_RATE SR_MHZ(24) +#define MAX_16BIT_SAMPLE_RATE SR_MHZ(12) + /* 6 delay states of up to 256 clock ticks */ #define MAX_SAMPLE_DELAY (6 * 256) @@ -73,7 +75,7 @@ struct context { uint64_t cur_samplerate; uint64_t limit_samples; - bool sample_wide; + gboolean sample_wide; uint16_t trigger_mask[NUM_TRIGGER_STAGES]; uint16_t trigger_value[NUM_TRIGGER_STAGES]; @@ -82,10 +84,14 @@ struct context { int num_samples; int submitted_transfers; + int empty_transfer_count; void *session_dev_id; struct sr_usb_dev_inst *usb; + + unsigned int num_transfers; + struct libusb_transfer **transfers; }; #endif