X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffx2lafw%2Ffx2lafw.h;h=227854c899742b89dac71f6904628e3feb283ccb;hb=0a8c0c324e16e4848498309dbb2efd27b4c812a9;hp=690c6deedb39f4a3dbd6bc9d53085b52e7baeab7;hpb=43125c69937d1599985c281de956f630c00525d6;p=libsigrok.git

diff --git a/hardware/fx2lafw/fx2lafw.h b/hardware/fx2lafw/fx2lafw.h
index 690c6dee..227854c8 100644
--- a/hardware/fx2lafw/fx2lafw.h
+++ b/hardware/fx2lafw/fx2lafw.h
@@ -17,32 +17,43 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBSIGROK_HARDWARE_FX2LAFW
-#define LIBSIGROK_HARDWARE_FX2LAFW
+#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_MS	3000
+#define NUM_SIMUL_TRANSFERS	32
+#define MAX_EMPTY_TRANSFERS	(NUM_SIMUL_TRANSFERS * 2)
 
-#define FIRMWARE_VID		0x0925
-#define FIRMWARE_PID		0x3881
+#define FX2LAFW_REQUIRED_VERSION_MAJOR	1
 
-#define MAX_RENUM_DELAY		3000 /* ms */
+/* 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 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
@@ -50,9 +61,21 @@ struct fx2lafw_device {
 	 * 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 */
+	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_data;
+	void *session_dev_id;
 
 	struct sr_usb_dev_inst *usb;
 };