X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkingst-la2016%2Fprotocol.h;h=ffdd09a242be17d364df7bbfe092797f9f839a50;hb=0fbb464bdf0951228d4430794263bb48bc668821;hp=11ee28347c19165add79ce3c4955ee79739c497d;hpb=038e65c1178b11323676194fcf921749364d704c;p=libsigrok.git

diff --git a/src/hardware/kingst-la2016/protocol.h b/src/hardware/kingst-la2016/protocol.h
index 11ee2834..ffdd09a2 100644
--- a/src/hardware/kingst-la2016/protocol.h
+++ b/src/hardware/kingst-la2016/protocol.h
@@ -1,6 +1,7 @@
 /*
  * This file is part of the libsigrok project.
  *
+ * Copyright (C) 2022 Gerhard Sittig <gerhard.sittig@gmx.net>
  * Copyright (C) 2020 Florian Schmidt <schmidt_florian@gmx.de>
  * Copyright (C) 2013 Marcus Comstedt <marcus@mc.pp.se>
  * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
@@ -44,10 +45,12 @@
  * 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_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
+#define CAPTURE_TIMEOUT_MS	500
 
 /*
  * Check for MCU firmware to take effect after upload. Check the device
@@ -88,6 +91,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
@@ -126,9 +134,11 @@ 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;
 	uint32_t packets_per_chunk;
@@ -145,11 +155,21 @@ struct dev_context {
 	uint32_t read_pos;
 
 	struct feed_queue_logic *feed_queue;
-	struct libusb_transfer *transfer;
+	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,
-	struct sr_context *sr_ctx, libusb_device *dev, uint16_t product_id);
+	struct sr_context *sr_ctx, libusb_device *dev, gboolean skip_upload);
 SR_PRIV int la2016_identify_device(const struct sr_dev_inst *sdi,
 	gboolean show_message);
 SR_PRIV int la2016_init_hardware(const struct sr_dev_inst *sdi);
@@ -160,5 +180,6 @@ SR_PRIV int la2016_setup_acquisition(const struct sr_dev_inst *sdi,
 SR_PRIV int la2016_start_acquisition(const struct sr_dev_inst *sdi);
 SR_PRIV int la2016_abort_acquisition(const struct sr_dev_inst *sdi);
 SR_PRIV int la2016_receive_data(int fd, int revents, void *cb_data);
+SR_PRIV void la2016_release_resources(const struct sr_dev_inst *sdi);
 
 #endif