fx2lafw: Added command to verify firmware version

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

diff --git a/hardware/fx2lafw/fx2lafw.h b/hardware/fx2lafw/fx2lafw.h
index 76196205cc0d700b947bec85c3ddec02a8f06b89..b03e86ab6fb94f1261032cc4f459eac240a0150d 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.h
+++ b/hardware/fx2lafw/fx2lafw.h
@@ -22,29 +22,35 @@
 
 #define USB_INTERFACE          0
 #define USB_CONFIGURATION      1
-#define TRIGGER_TYPES          "01rf"
-#define FIRMWARE               FIRMWARE_DIR "/fx2lafw-cwav-usbeeax.fw"
-
-#define FIRMWARE_VID           0x0925
-#define FIRMWARE_PID           0x3881
+#define NUM_TRIGGER_STAGES     4
+#define TRIGGER_TYPES          "01"
 
 #define MAX_RENUM_DELAY                3000 /* ms */
-#define NUM_SIMUL_TRANSFERS    10
+#define NUM_SIMUL_TRANSFERS    32
 #define MAX_EMPTY_TRANSFERS    (NUM_SIMUL_TRANSFERS * 2)
 
+#define FX2LAFW_VERSION_MAJOR  1
+#define FX2LAFW_VERSION_MINOR  0
+
+
+/* Software trigger implementation: positive values indicate trigger stage. */
+#define TRIGGER_FIRED          -1
+
 struct fx2lafw_profile {
        uint16_t vid;
        uint16_t pid;
 
-       char *vendor;
-       char *model;
-       char *model_version;
+       const char *vendor;
+       const char *model;
+       const char *model_version;
+
+       const char *firmware;
 
        int num_probes;
 };
 
 struct context {
-       struct fx2lafw_profile *profile;
+       const struct fx2lafw_profile *profile;
 
        /*
         * Since we can't keep track of an fx2lafw device after upgrading
@@ -55,9 +61,18 @@ struct context {
        GTimeVal fw_updated;
 
        /* Device/Capture Settings */
+       uint64_t cur_samplerate;
        uint64_t limit_samples;
 
-       void *session_data;
+       uint8_t trigger_mask[NUM_TRIGGER_STAGES];
+       uint8_t trigger_value[NUM_TRIGGER_STAGES];
+       int trigger_stage;
+       uint8_t trigger_buffer[NUM_TRIGGER_STAGES];
+
+       int num_samples;
+       int submitted_transfers;
+
+       void *session_dev_id;
 
        struct sr_usb_dev_inst *usb;
 };