X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffx2lafw%2Ffx2lafw.h;h=1e3c09906eca2ec69ab3f0e4b6f00b9dca410c06;hb=7ec5b54955118d8c1ee003a02c3334f1a0046457;hp=52c4c3a612c5ab0fd2c7247a09a9ac17da043209;hpb=7e41e319d9a76da527eaa6e2708e4909ffd0d971;p=libsigrok.git
diff --git a/hardware/fx2lafw/fx2lafw.h b/hardware/fx2lafw/fx2lafw.h
index 52c4c3a6..1e3c0990 100644
--- a/hardware/fx2lafw/fx2lafw.h
+++ b/hardware/fx2lafw/fx2lafw.h
@@ -18,15 +18,24 @@
* along with this program. If not, see .
*/
-#include
-
#ifndef LIBSIGROK_HARDWARE_FX2LAFW_FX2LAFW_H
#define LIBSIGROK_HARDWARE_FX2LAFW_FX2LAFW_H
+#include
+
+/* 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
@@ -34,12 +43,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;
@@ -50,15 +66,15 @@ struct fx2lafw_profile {
const char *firmware;
- int num_probes;
+ 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.
*/
@@ -68,17 +84,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