fx2lafw: Made fx2lafw profiles const

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

diff --git a/hardware/fx2lafw/fx2lafw.h b/hardware/fx2lafw/fx2lafw.h
index 49d9311557a2a2a6b53d4bbadcfa0efb95945ef9..a2e6bcfbbe6d5ac0cb3b31d26d3b48fc46698219 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.h
+++ b/hardware/fx2lafw/fx2lafw.h
@@ -17,28 +17,49 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBSIGROK_HARDWARE_FX2LAFW
-#define LIBSIGROK_HARDWARE_FX2LAFW
+#ifndef LIBSIGROK_HARDWARE_FX2LAFW_FX2LAFW_H
+#define LIBSIGROK_HARDWARE_FX2LAFW_FX2LAFW_H
 
-#define TRIGGER_TYPES       "01rf"
+#define USB_INTERFACE          0
+#define USB_CONFIGURATION      1
+#define TRIGGER_TYPES          "01rf"
+#define FIRMWARE               FIRMWARE_DIR "/fx2lafw-cwav-usbeeax.fw"
+
+#define MAX_RENUM_DELAY                3000 /* ms */
+#define NUM_SIMUL_TRANSFERS    10
+#define MAX_EMPTY_TRANSFERS    (NUM_SIMUL_TRANSFERS * 2)
 
 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;
 
        int num_probes;
 };
 
-struct fx2lafw_device {
-       struct fx2lafw_profile *profile;
+struct context {
+       const struct fx2lafw_profile *profile;
+
+       /*
+        * Since we can't keep track of an fx2lafw device after upgrading
+        * the firmware (it re-enumerates into a different device address
+        * 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;
+
+       /* Device/Capture Settings */
+       uint64_t cur_samplerate;
+       uint64_t limit_samples;
+
+       int num_samples;
 
-       void *session_data;
+       void *session_dev_id;
 
-       struct sr_usb_device_instance *usb;
+       struct sr_usb_dev_inst *usb;
 };
 
 #endif