X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffx2lafw%2Ffx2lafw.h;h=ae3ed1bc31753664ed9b8e345447ad56468db799;hb=0caa1ef0cb0b2231e232a7d1681e4e13fe838035;hp=4b830cd00f265d0162f9bf07fa7b4f2acd5d3b0b;hpb=3cd3a20b350ed1e86675aee067f60ac5a2f576b1;p=libsigrok.git

diff --git a/hardware/fx2lafw/fx2lafw.h b/hardware/fx2lafw/fx2lafw.h
index 4b830cd0..ae3ed1bc 100644
--- 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,34 +18,50 @@
  * 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 FIRMWARE_VID		0x0925
-#define FIRMWARE_PID		0x3881
+#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
+
+#define MAX_8BIT_SAMPLE_RATE	SR_MHZ(24)
+#define MAX_16BIT_SAMPLE_RATE	SR_MHZ(12)
+
+/* 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
+
+#define DEV_CAPS_16BIT_POS	0
+
+#define DEV_CAPS_16BIT		(1 << DEV_CAPS_16BIT_POS)
+
 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;
+	uint32_t dev_caps;
 };
 
 struct context {
-	struct fx2lafw_profile *profile;
+	const struct fx2lafw_profile *profile;
 
 	/*
 	 * Since we can't keep track of an fx2lafw device after upgrading
@@ -52,14 +69,29 @@ 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;
 
+	gboolean sample_wide;
+
+	uint16_t trigger_mask[NUM_TRIGGER_STAGES];
+	uint16_t trigger_value[NUM_TRIGGER_STAGES];
+	int trigger_stage;
+	uint16_t trigger_buffer[NUM_TRIGGER_STAGES];
+
+	int num_samples;
+	int submitted_transfers;
+	int empty_transfer_count;
+
 	void *session_dev_id;
 
 	struct sr_usb_dev_inst *usb;
+
+	unsigned int num_transfers;
+	struct libusb_transfer **transfers;
 };
 
 #endif