X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkingst-la2016%2Fprotocol.h;h=c308005e3535cb02581da8bea5ffe3440ede2e32;hb=6d53e9497892df15e13899465ce4c2962a70a782;hp=b0dc3d04845912d2f28535dd88cfb4fb218bb7a6;hpb=480efba284cbf84801af16d1997ce853d7fe5c63;p=libsigrok.git

diff --git a/src/hardware/kingst-la2016/protocol.h b/src/hardware/kingst-la2016/protocol.h
index b0dc3d04..c308005e 100644
--- a/src/hardware/kingst-la2016/protocol.h
+++ b/src/hardware/kingst-la2016/protocol.h
@@ -69,13 +69,25 @@
 #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_MAX	(UINT64_C(10 * 1000 * 1000 * 1000))
+
+/* Maximum device capabilities. May differ between models. */
+#define MAX_PWM_FREQ		SR_MHZ(20)
+#define PWM_CLOCK		SR_MHZ(200)	/* 200MHz for both LA2016 and LA1016 */
 
 #define LA2016_NUM_PWMCH_MAX	2
 
 #define LA2016_CONVBUFFER_SIZE	(4 * 1024 * 1024)
 
+struct kingst_model {
+	uint8_t magic;		/* EEPROM magic byte value. */
+	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). */
+};
+
 struct pwm_setting_dev {
 	uint32_t period;
 	uint32_t duty;
@@ -104,18 +116,20 @@ struct pwm_setting {
 };
 
 struct dev_context {
-	struct sr_context *ctx;
-	uint64_t fw_uploaded;
+	uint16_t usb_pid;
+	char *mcu_firmware;
+	char *fpga_bitstream;
+	uint64_t fw_uploaded; /* Timestamp of most recent FW upload. */
+	uint8_t identify_magic;
+	const struct kingst_model *model;
 
 	/* 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;
@@ -129,18 +143,20 @@ 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;
 };
 
-SR_PRIV int la2016_upload_firmware(struct sr_context *sr_ctx,
-	libusb_device *dev, uint16_t product_id);
+SR_PRIV int la2016_upload_firmware(const struct sr_dev_inst *sdi,
+	struct sr_context *sr_ctx, libusb_device *dev, uint16_t product_id);
 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 int la2016_init_device(const struct sr_dev_inst *sdi);
-SR_PRIV int la2016_deinit_device(const struct sr_dev_inst *sdi);
+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);
+SR_PRIV int la2016_init_params(const struct sr_dev_inst *sdi);
+SR_PRIV int la2016_deinit_hardware(const struct sr_dev_inst *sdi);
 
 #endif