kingst-la2016: rename logic channels to match product's labels

[libsigrok.git] / src / hardware / kingst-la2016 / protocol.h

diff --git a/src/hardware/kingst-la2016/protocol.h b/src/hardware/kingst-la2016/protocol.h
index 8ea01809e439ccc7aa4743a0af02b9a9897db2c8..d5c967ad053c69889601b79bf973f6d7c850746b 100644 (file)
--- a/src/hardware/kingst-la2016/protocol.h
+++ b/src/hardware/kingst-la2016/protocol.h
@@ -30,8 +30,11 @@
 
 #define LA2016_VID             0x77a1
 #define LA2016_PID             0x01a2
+#define LA2016_IPRODUCT_INDEX  2
 #define USB_INTERFACE          0
 #define USB_CONFIGURATION      1
+#define USB_EP_FPGA_BITSTREAM  2
+#define USB_EP_CAPTURE_DATA    6
 
 /*
  * On Windows sigrok uses WinUSB RAW_IO policy which requires the
@@ -57,72 +60,75 @@
 #define RENUM_GONE_DELAY_MS    1800
 #define RENUM_POLL_INTERVAL_MS 200
 
+/*
+ * The device expects some zero padding to follow the content of the
+ * file which contains the FPGA bitstream. Specify the chunk size here.
+ */
+#define LA2016_EP2_PADDING     2048
+
 #define LA2016_THR_VOLTAGE_MIN 0.40
 #define LA2016_THR_VOLTAGE_MAX 4.00
 
 #define LA2016_NUM_SAMPLES_MIN 256
 #define LA2016_NUM_SAMPLES_MAX (10UL * 1000 * 1000 * 1000)
 
-typedef struct pwm_setting_dev {
+#define LA2016_NUM_PWMCH_MAX   2
+
+#define LA2016_CONVBUFFER_SIZE (4 * 1024 * 1024)
+
+struct pwm_setting_dev {
        uint32_t period;
        uint32_t duty;
-} pwm_setting_dev_t;
+};
 
-typedef struct trigger_cfg {
+struct trigger_cfg {
        uint32_t channels;
        uint32_t enabled;
        uint32_t level;
        uint32_t high_or_falling;
-} trigger_cfg_t;
+};
 
-typedef struct capture_info {
+struct capture_info {
        uint32_t n_rep_packets;
        uint32_t n_rep_packets_before_trigger;
        uint32_t write_pos;
-} capture_info_t;
+};
 
 #define NUM_PACKETS_IN_CHUNK   5
 #define TRANSFER_PACKET_LENGTH 16
 
-typedef struct pwm_setting {
-       uint8_t enabled;
+struct pwm_setting {
+       gboolean enabled;
        float freq;
        float duty;
-} pwm_setting_t;
+};
 
 struct dev_context {
-       struct sr_context *ctx;
-       uint64_t fw_uploaded;
+       uint64_t fw_uploaded; /* Timestamp of most recent FW upload. */
 
        /* User specified parameters. */
-       pwm_setting_t pwm_setting[2];
-       unsigned int threshold_voltage_idx;
+       struct pwm_setting pwm_setting[LA2016_NUM_PWMCH_MAX];
+       size_t threshold_voltage_idx;
        float threshold_voltage;
        uint64_t max_samplerate;
        uint64_t cur_samplerate;
        uint64_t limit_samples;
        uint64_t capture_ratio;
        uint16_t cur_channels;
-       int num_channels;
-
-       uint32_t bitstream_size;
-
-       /* Values derived from user specs. */
-       uint64_t pre_trigger_size;
 
        /* Internal acquisition and download state. */
-       int had_triggers_configured;
-       int have_trigger;
-       int transfer_finished;
-       capture_info_t info;
-       unsigned int n_transfer_packets_to_read; /* each with 5 acq packets */
-       unsigned int n_bytes_to_read;
-       unsigned int n_reps_until_trigger;
-       unsigned int reading_behind_trigger;
+       gboolean trigger_involved;
+       gboolean completion_seen;
+       gboolean download_finished;
+       struct capture_info info;
+       uint32_t n_transfer_packets_to_read; /* each with 5 acq packets */
+       uint32_t n_bytes_to_read;
+       uint32_t n_reps_until_trigger;
+       gboolean trigger_marked;
        uint64_t total_samples;
        uint32_t read_pos;
 
-       unsigned int convbuffer_size;
+       size_t convbuffer_size;
        uint8_t *convbuffer;
        struct libusb_transfer *transfer;
 };