fx2lafw: Cosmetics.

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

diff --git a/hardware/fx2lafw/fx2lafw.h b/hardware/fx2lafw/fx2lafw.h
index 716904f1b9abdf0529ede0de71f4f21933135197..dca21ba3aed9747d40f605976776955c51199754 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.h
+++ b/hardware/fx2lafw/fx2lafw.h
@@ -17,17 +17,29 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <glib.h>
+
 #ifndef LIBSIGROK_HARDWARE_FX2LAFW_FX2LAFW_H
 #define LIBSIGROK_HARDWARE_FX2LAFW_FX2LAFW_H
 
 #define USB_INTERFACE          0
 #define USB_CONFIGURATION      1
-#define TRIGGER_TYPES          "01rf"
+#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
+
+/* 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
+
 struct fx2lafw_profile {
        uint16_t vid;
        uint16_t pid;
@@ -56,7 +68,13 @@ struct context {
        uint64_t cur_samplerate;
        uint64_t limit_samples;
 
+       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;