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

diff --git a/src/hardware/kingst-la2016/protocol.h b/src/hardware/kingst-la2016/protocol.h
index 66c0fcbc..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
 
@@ -95,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 {
@@ -130,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