X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffx2lafw%2Ffx2lafw.h;h=227854c899742b89dac71f6904628e3feb283ccb;hb=0a8c0c324e16e4848498309dbb2efd27b4c812a9;hp=b03e86ab6fb94f1261032cc4f459eac240a0150d;hpb=13bf7eccbb08214c3d6d53da5b5b6a269a64a779;p=libsigrok.git
diff --git a/hardware/fx2lafw/fx2lafw.h b/hardware/fx2lafw/fx2lafw.h
index b03e86ab..227854c8 100644
--- a/hardware/fx2lafw/fx2lafw.h
+++ b/hardware/fx2lafw/fx2lafw.h
@@ -17,6 +17,8 @@
* along with this program. If not, see .
*/
+#include
+
#ifndef LIBSIGROK_HARDWARE_FX2LAFW_FX2LAFW_H
#define LIBSIGROK_HARDWARE_FX2LAFW_FX2LAFW_H
@@ -25,13 +27,14 @@
#define NUM_TRIGGER_STAGES 4
#define TRIGGER_TYPES "01"
-#define MAX_RENUM_DELAY 3000 /* ms */
+#define MAX_RENUM_DELAY_MS 3000
#define NUM_SIMUL_TRANSFERS 32
#define MAX_EMPTY_TRANSFERS (NUM_SIMUL_TRANSFERS * 2)
-#define FX2LAFW_VERSION_MAJOR 1
-#define FX2LAFW_VERSION_MINOR 0
+#define FX2LAFW_REQUIRED_VERSION_MAJOR 1
+/* 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
@@ -58,9 +61,9 @@ struct context {
* after the upgrade) this is like a global lock. No device will open
* until a proper delay after the last device was upgraded.
*/
- GTimeVal fw_updated;
+ int64_t fw_updated;
- /* Device/Capture Settings */
+ /* Device/capture settings */
uint64_t cur_samplerate;
uint64_t limit_samples;