kingst-la2016: add my copyright for recent improvements

[libsigrok.git] / src / hardware / kingst-la2016 / protocol.h

diff --git a/src/hardware/kingst-la2016/protocol.h b/src/hardware/kingst-la2016/protocol.h
index 4e16b37227736110cc6b76467c19060d5d6147f1..6204e85250cf658229f103e0b3d4d76629ac222e 100644 (file)
--- a/src/hardware/kingst-la2016/protocol.h
+++ b/src/hardware/kingst-la2016/protocol.h
@@ -1,6 +1,7 @@
 /*
  * This file is part of the libsigrok project.
  *
+ * Copyright (C) 2022 Gerhard Sittig <gerhard.sittig@gmx.net>
  * Copyright (C) 2020 Florian Schmidt <schmidt_florian@gmx.de>
  * Copyright (C) 2013 Marcus Comstedt <marcus@mc.pp.se>
  * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
@@ -67,27 +68,19 @@
 #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
 
+/* Properties related to the layout of capture data downloads. */
+#define TRANSFER_PACKET_LENGTH 16
 #define LA2016_NUM_SAMPLES_MAX (UINT64_C(10 * 1000 * 1000 * 1000))
 
 /* Maximum device capabilities. May differ between models. */
@@ -96,6 +89,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,15 +124,16 @@ 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;
 
        /* Internal acquisition and download state. */
        gboolean trigger_involved;
+       gboolean frame_begin_sent;
        gboolean completion_seen;
        gboolean download_finished;
+       uint32_t packets_per_chunk;
        struct capture_info {
                uint32_t n_rep_packets;
                uint32_t n_rep_packets_before_trigger;
@@ -149,7 +151,7 @@ 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);
+       struct sr_context *sr_ctx, libusb_device *dev, gboolean skip_upload);
 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);