X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffx2lafw%2Ffx2lafw.h;h=ae3ed1bc31753664ed9b8e345447ad56468db799;hb=dd34b8d3c4da18f8cf339c5bb8f0d6268f3d13f6;hp=227854c899742b89dac71f6904628e3feb283ccb;hpb=0a8c0c324e16e4848498309dbb2efd27b4c812a9;p=libsigrok.git

diff --git a/hardware/fx2lafw/fx2lafw.h b/hardware/fx2lafw/fx2lafw.h
index 227854c8..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
@@ -33,12 +34,19 @@
 
 #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;
@@ -49,7 +57,7 @@ struct fx2lafw_profile {
 
 	const char *firmware;
 
-	int num_probes;
+	uint32_t dev_caps;
 };
 
 struct context {
@@ -67,17 +75,23 @@ struct context {
 	uint64_t cur_samplerate;
 	uint64_t limit_samples;
 
-	uint8_t trigger_mask[NUM_TRIGGER_STAGES];
-	uint8_t trigger_value[NUM_TRIGGER_STAGES];
+	gboolean sample_wide;
+
+	uint16_t trigger_mask[NUM_TRIGGER_STAGES];
+	uint16_t trigger_value[NUM_TRIGGER_STAGES];
 	int trigger_stage;
-	uint8_t trigger_buffer[NUM_TRIGGER_STAGES];
+	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