Bump copyright year

[libsigrok.git] / hardware / fx2lafw / fx2lafw.h

diff --git a/hardware/fx2lafw/fx2lafw.h b/hardware/fx2lafw/fx2lafw.h
index 6da663c90f5a66c102785f5ada10cb87f6123cb6..3c1116b3af47315ae6d029ce93fe29c256463e4f 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.h
+++ b/hardware/fx2lafw/fx2lafw.h
@@ -1,6 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
+ * Copyright (C) 2013 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
@@ -20,47 +21,86 @@
 #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 TRIGGER_TYPES          "01rf"
-#define FIRMWARE               FIRMWARE_DIR "/fx2lafw-cwav-usbeeax.fw"
+#define NUM_TRIGGER_STAGES     4
+#define TRIGGER_TYPE           "01"
 
-#define FIRMWARE_VID           0x0925
-#define FIRMWARE_PID           0x3881
-
-#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;
 
-       int num_probes;
+       const char *firmware;
+
+       uint32_t dev_caps;
 };
 
-struct context {
-       struct fx2lafw_profile *profile;
+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.
         */
-       GTimeVal fw_updated;
+       int64_t fw_updated;
 
-       /* Device/Capture Settings */
+       /* Device/capture settings */
        uint64_t cur_samplerate;
        uint64_t limit_samples;
 
-       void *session_dev_id;
+       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 *cb_data;
 
        struct sr_usb_dev_inst *usb;
+
+       unsigned int num_transfers;
+       struct libusb_transfer **transfers;
 };
 
 #endif