sr: fx2lafw: Forgot to add (C) line to fx2lafw.h in recent commit.

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

diff --git a/hardware/fx2lafw/fx2lafw.h b/hardware/fx2lafw/fx2lafw.h
index fccd0232f5b59a6291cbfe51b1e2b2c1ff669a5e..52c4c3a612c5ab0fd2c7247a09a9ac17da043209 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.h
+++ b/hardware/fx2lafw/fx2lafw.h
@@ -1,6 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -17,18 +18,28 @@
  * 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 FIRMWARE               FIRMWARE_DIR "/fx2lafw-cwav-usbeeax.fw"
+#define NUM_TRIGGER_STAGES     4
+#define TRIGGER_TYPES          "01"
 
-#define MAX_RENUM_DELAY                3000 /* ms */
-#define NUM_SIMUL_TRANSFERS    10
+#define MAX_RENUM_DELAY_MS     3000
+#define NUM_SIMUL_TRANSFERS    32
 #define MAX_EMPTY_TRANSFERS    (NUM_SIMUL_TRANSFERS * 2)
 
+#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
+
 struct fx2lafw_profile {
        uint16_t vid;
        uint16_t pid;
@@ -37,11 +48,13 @@ struct fx2lafw_profile {
        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
@@ -49,13 +62,19 @@ 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;
 
+       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;