X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkingst-la2016%2Fprotocol.h;h=4e16b37227736110cc6b76467c19060d5d6147f1;hb=9270f8f437581605ab4e3e808e2bd62f41ab7d35;hp=2569da50d5e72b9b6a026cf019b73c5d074305cc;hpb=08a49848666580f28a2fae9167dfc3f20331e290;p=libsigrok.git

diff --git a/src/hardware/kingst-la2016/protocol.h b/src/hardware/kingst-la2016/protocol.h
index 2569da50..4e16b372 100644
--- a/src/hardware/kingst-la2016/protocol.h
+++ b/src/hardware/kingst-la2016/protocol.h
@@ -66,6 +66,25 @@
  */
 #define LA2016_EP2_PADDING	2048
 
+/*
+ * The complex logic input threshold voltage support with a custom level
+ * is not operational yet. Ideally we could support the set of pre-made
+ * voltages with their pretty text labels, and one of them referencing
+ * a voltage which is user specified. But not all applications support
+ * this setup equally well, or present it most appropriately to users.
+ * So let's implement something simpler for the moment until the more
+ * complex approach becomes accessible in all applications.
+ *
+ * Strictly speaking the logic input threshold voltage is a property of
+ * the "Logic" channel group. Again not all applications support such
+ * an approach, and like to see them as global device properties.
+ */
+#define WITH_THRESHOLD_DEVCFG	1
+#define WITH_THRESHOLD_SIMPLE	1
+#if !WITH_THRESHOLD_DEVCFG && !WITH_THRESHOLD_SIMPLE
+#  error "Custom threshold in Logic group is not implemented."
+#endif
+
 #define LA2016_THR_VOLTAGE_MIN	0.40
 #define LA2016_THR_VOLTAGE_MAX	4.00
 
@@ -88,22 +107,6 @@ struct kingst_model {
 	uint64_t memory_bits;	/* RAM capacity in Gbit (1, 2, 4). */
 };
 
-struct trigger_cfg {
-	uint32_t channels;
-	uint32_t enabled;
-	uint32_t level;
-	uint32_t high_or_falling;
-};
-
-struct capture_info {
-	uint32_t n_rep_packets;
-	uint32_t n_rep_packets_before_trigger;
-	uint32_t write_pos;
-};
-
-#define NUM_PACKETS_IN_CHUNK	5
-#define TRANSFER_PACKET_LENGTH	16
-
 struct dev_context {
 	uint16_t usb_pid;
 	char *mcu_firmware;
@@ -111,6 +114,7 @@ struct dev_context {
 	uint64_t fw_uploaded; /* Timestamp of most recent FW upload. */
 	uint8_t identify_magic;
 	const struct kingst_model *model;
+	struct sr_channel_group *cg_logic, *cg_pwm;
 
 	/* User specified parameters. */
 	struct pwm_setting {
@@ -128,7 +132,11 @@ struct dev_context {
 	gboolean trigger_involved;
 	gboolean completion_seen;
 	gboolean download_finished;
-	struct capture_info info;
+	struct capture_info {
+		uint32_t n_rep_packets;
+		uint32_t n_rep_packets_before_trigger;
+		uint32_t write_pos;
+	} 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;
@@ -142,14 +150,15 @@ struct dev_context {
 
 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_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_deinit_hardware(const struct sr_dev_inst *sdi);
 SR_PRIV int la2016_write_pwm_config(const struct sr_dev_inst *sdi, size_t idx);
+SR_PRIV int la2016_setup_acquisition(const struct sr_dev_inst *sdi,
+	double voltage);
+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);
 
 #endif