sr: fx2lafw: Only check for correct major FW version.

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

diff --git a/hardware/fx2lafw/fx2lafw.h b/hardware/fx2lafw/fx2lafw.h
index dca21ba3aed9747d40f605976776955c51199754..227854c899742b89dac71f6904628e3feb283ccb 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.h
+++ b/hardware/fx2lafw/fx2lafw.h
@@ -27,12 +27,11 @@
 #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)
@@ -62,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;