X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkingst-la2016%2Fprotocol.h;h=41367bdfca9eb5b63be7d91c0995c093517ab955;hb=a38f0f5e28c497be051b62402be1ee90e68bc2d2;hp=0d61fa71fbef5a63055138eae271bb81e29528c6;hpb=520a20e90b7a20123a1cb83e80f8d6f29e1e5316;p=libsigrok.git

diff --git a/src/hardware/kingst-la2016/protocol.h b/src/hardware/kingst-la2016/protocol.h
index 0d61fa71..41367bdf 100644
--- a/src/hardware/kingst-la2016/protocol.h
+++ b/src/hardware/kingst-la2016/protocol.h
@@ -69,8 +69,23 @@
 #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)
+#define LA2016_NUM_SAMPLES_MIN	(UINT64_C(256))
+#define LA2016_NUM_SAMPLES_MAX	(UINT64_C(10 * 1000 * 1000 * 1000))
+
+/* Maximum device capabilities. May differ between models. */
+#define MAX_SAMPLE_RATE_LA2016	SR_MHZ(200)
+#define MAX_SAMPLE_RATE_LA1016	SR_MHZ(100)
+#define MIN_SAMPLE_RATE_LA2016	SR_KHZ(10)
+#define MAX_PWM_FREQ		SR_MHZ(20)
+#define PWM_CLOCK		SR_MHZ(200)	/* 200MHz for both LA2016 and LA1016 */
+
+/* TODO
+ * What is the origin and motivation of that 128Mi literal? What is its
+ * unit? How does it relate to a device's hardware capabilities? How to
+ * map the 1GiB of RAM of an LA2016 (at 16 channels) to the 128Mi value?
+ * It cannot be sample count. Is it memory size in bytes perhaps?
+ */
+#define LA2016_PRE_MEM_LIMIT_BASE	(128 * 1024 * 1024)
 
 #define LA2016_NUM_PWMCH_MAX	2
 
@@ -108,13 +123,12 @@ struct dev_context {
 
 	/* User specified parameters. */
 	struct pwm_setting pwm_setting[LA2016_NUM_PWMCH_MAX];
-	unsigned int threshold_voltage_idx;
+	size_t threshold_voltage_idx;
 	float threshold_voltage;
 	uint64_t max_samplerate;
 	uint64_t cur_samplerate;
-	uint64_t limit_samples;
+	struct sr_sw_limits sw_limits;
 	uint64_t capture_ratio;
-	uint16_t cur_channels;
 
 	/* Internal acquisition and download state. */
 	gboolean trigger_involved;
@@ -128,8 +142,7 @@ struct dev_context {
 	uint64_t total_samples;
 	uint32_t read_pos;
 
-	size_t convbuffer_size;
-	uint8_t *convbuffer;
+	struct feed_queue_logic *feed_queue;
 	struct libusb_transfer *transfer;
 };