X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffx2lafw%2Ffx2lafw.h;h=2958a9695ce76c8e583a04a9f5b70a07b3336c6d;hb=365f04d61f54908013021be83450d38fff67964f;hp=c6ad3ce11d28afb87fcb4f90e8fffd6d7536e71b;hpb=0a88ec3d9c97d20a26f2c0d8813ce7ba075421f6;p=libsigrok.git

diff --git a/hardware/fx2lafw/fx2lafw.h b/hardware/fx2lafw/fx2lafw.h
index c6ad3ce1..2958a969 100644
--- a/hardware/fx2lafw/fx2lafw.h
+++ b/hardware/fx2lafw/fx2lafw.h
@@ -18,15 +18,24 @@
  * 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
 
+#include <glib.h>
+
+/* Message logging helpers with driver-specific prefix string. */
+#define DRIVER_LOG_DOMAIN "fx2lafw: "
+#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
+#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+
 #define USB_INTERFACE		0
 #define USB_CONFIGURATION	1
 #define NUM_TRIGGER_STAGES	4
-#define TRIGGER_TYPES		"01"
+#define TRIGGER_TYPE 		"01"
 
 #define MAX_RENUM_DELAY_MS	3000
 #define NUM_SIMUL_TRANSFERS	32
@@ -60,12 +69,12 @@ struct fx2lafw_profile {
 	uint32_t dev_caps;
 };
 
-struct context {
+struct dev_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
+	 * the firmware (it renumerates 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.
 	 */
@@ -84,10 +93,14 @@ struct context {
 
 	int num_samples;
 	int submitted_transfers;
+	int empty_transfer_count;
 
-	void *session_dev_id;
+	void *cb_data;
 
 	struct sr_usb_dev_inst *usb;
+
+	unsigned int num_transfers;
+	struct libusb_transfer **transfers;
 };
 
 #endif