output/csv: use intermediate time_t var, silence compiler warning

[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 bbb44c336a8edcf7541b392aa47fa3d3a665b7ba..371a3ccd8e710255a866ef1907f0b1caad029155 100644 (file)
--- a/src/hardware/kingst-la2016/protocol.h
+++ b/src/hardware/kingst-la2016/protocol.h
@@ -45,8 +45,8 @@
  * but libusb does not expose this function. Typically, max size is 2MB.
  */
 #define LA2016_EP6_PKTSZ       512 /* Max packet size of USB endpoint 6. */
-#define LA2016_USB_BUFSZ       (256 * 2 * LA2016_EP6_PKTSZ) /* 256KiB buffer. */
-#define LA2016_USB_XFER_COUNT  32 /* Size of USB bulk transfers pool. */
+#define LA2016_USB_BUFSZ       (512 * 1024) /* 512KiB buffer. */
+#define LA2016_USB_XFER_COUNT  8 /* Size of USB bulk transfers pool. */
 
 /* USB communication timeout during regular operation. */
 #define DEFAULT_TIMEOUT_MS     200
@@ -67,7 +67,7 @@
  * 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_EP2_PADDING     4096
 
 /*
  * Whether the logic input threshold voltage is a config item of the
@@ -81,8 +81,6 @@
 #define LA2016_THR_VOLTAGE_MIN 0.40
 #define LA2016_THR_VOLTAGE_MAX 4.00
 
-/* Properties related to the layout of capture data downloads. */
-#define TRANSFER_PACKET_LENGTH 16
 #define LA2016_NUM_SAMPLES_MAX (UINT64_C(10 * 1000 * 1000 * 1000))
 
 /* Maximum device capabilities. May differ between models. */
@@ -91,6 +89,11 @@
 
 #define LA2016_NUM_PWMCH_MAX   2
 
+/* Streaming mode related thresholds. Not enforced, used for warnings. */
+#define LA2016_STREAM_MBPS_MAX 200     /* In units of Mbps. */
+#define LA2016_STREAM_PUSH_THR 16      /* In units of Mbps. */
+#define LA2016_STREAM_PUSH_IVAL        250     /* In units of ms. */
+
 /*
  * Whether to de-initialize the device hardware in the driver's close
  * callback. It is desirable to e.g. configure PWM channels and leave
@@ -102,12 +105,13 @@
 #define LA2016_CONVBUFFER_SIZE (4 * 1024 * 1024)
 
 struct kingst_model {
-       uint8_t magic;          /* EEPROM magic byte value. */
+       uint8_t magic, magic2;  /* EEPROM magic byte values. */
        const char *name;       /* User perceived model name. */
        const char *fpga_stem;  /* Bitstream filename stem. */
        uint64_t samplerate;    /* Max samplerate in Hz. */
        size_t channel_count;   /* Max channel count (16, 32). */
        uint64_t memory_bits;   /* RAM capacity in Gbit (1, 2, 4). */
+       uint64_t baseclock;     /* Base clock to derive samplerate from. */
 };
 
 struct dev_context {
@@ -115,8 +119,9 @@ struct dev_context {
        char *mcu_firmware;
        char *fpga_bitstream;
        uint64_t fw_uploaded; /* Timestamp of most recent FW upload. */
-       uint8_t identify_magic;
+       uint8_t identify_magic, identify_magic2;
        const struct kingst_model *model;
+       char **channel_names_logic;
        struct sr_channel_group *cg_logic, *cg_pwm;
 
        /* User specified parameters. */
@@ -129,12 +134,15 @@ struct dev_context {
        uint64_t samplerate;
        struct sr_sw_limits sw_limits;
        uint64_t capture_ratio;
+       gboolean continuous;
 
        /* Internal acquisition and download state. */
        gboolean trigger_involved;
        gboolean frame_begin_sent;
        gboolean completion_seen;
        gboolean download_finished;
+       size_t transfer_size;
+       size_t sequence_size;
        uint32_t packets_per_chunk;
        struct capture_info {
                uint32_t n_rep_packets;
@@ -151,6 +159,15 @@ struct dev_context {
        struct feed_queue_logic *feed_queue;
        GSList *transfers;
        size_t transfer_bufsize;
+       struct stream_state_t {
+               size_t enabled_count;
+               uint32_t enabled_mask;
+               uint32_t channel_masks[32];
+               size_t channel_index;
+               uint32_t sample_data[32];
+               uint64_t flush_period_ms;
+               uint64_t last_flushed;
+       } stream;
 };
 
 SR_PRIV int la2016_upload_firmware(const struct sr_dev_inst *sdi,