X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffx2lafw%2Ffx2lafw.h;h=dca21ba3aed9747d40f605976776955c51199754;hb=37dc0b16a6d6aca8f98b4baee24028f3714f91d4;hp=bbdaf33eca53ababf1e5a47d112ca2740e5872cc;hpb=2e526f4a6a96bca01c81620ff820aa39e356977f;p=libsigrok.git
diff --git a/hardware/fx2lafw/fx2lafw.h b/hardware/fx2lafw/fx2lafw.h
index bbdaf33e..dca21ba3 100644
--- a/hardware/fx2lafw/fx2lafw.h
+++ b/hardware/fx2lafw/fx2lafw.h
@@ -17,31 +17,44 @@
* along with this program. If not, see .
*/
+#include
+
#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 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;
- 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,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;