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

diff --git a/src/hardware/kingst-la2016/protocol.h b/src/hardware/kingst-la2016/protocol.h
index 4e16b372..3b251ed1 100644
--- a/src/hardware/kingst-la2016/protocol.h
+++ b/src/hardware/kingst-la2016/protocol.h
@@ -67,23 +67,13 @@
 #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.
+ * Whether the logic input threshold voltage is a config item of the
+ * "Logic" channel group or a global config item of the device. Ideally
+ * it would be the former (being strictly related to the Logic channels)
+ * but mainline applications work better with the latter, and many other
+ * device drivers implement it that way, too.
  */
 #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
@@ -96,6 +86,14 @@
 
 #define LA2016_NUM_PWMCH_MAX	2
 
+/*
+ * Whether to de-initialize the device hardware in the driver's close
+ * callback. It is desirable to e.g. configure PWM channels and leave
+ * the generator running after the application shuts down. Users can
+ * always disable channels on their way out if they want to.
+ */
+#define WITH_DEINIT_IN_CLOSE	0
+
 #define LA2016_CONVBUFFER_SIZE	(4 * 1024 * 1024)
 
 struct kingst_model {
@@ -123,8 +121,7 @@ struct dev_context {
 		float duty;
 	} pwm_setting[LA2016_NUM_PWMCH_MAX];
 	size_t threshold_voltage_idx;
-	float threshold_voltage;
-	uint64_t cur_samplerate;
+	uint64_t samplerate;
 	struct sr_sw_limits sw_limits;
 	uint64_t capture_ratio;