kingst-la2016: fix segfault that often occurs when a capture is aborted

[libsigrok.git] / src / hardware / fx2lafw / protocol.h

diff --git a/src/hardware/fx2lafw/protocol.h b/src/hardware/fx2lafw/protocol.h
index a18696c6055efe3b0a9862b31edede56a61757ef..2c56b02ca6962cae97d55d03f190182aa4b1438f 100644 (file)
--- a/src/hardware/fx2lafw/protocol.h
+++ b/src/hardware/fx2lafw/protocol.h
@@ -98,22 +98,21 @@ struct dev_context {
         */
        int64_t fw_updated;
 
-       /* Supported samplerates */
        const uint64_t *samplerates;
        int num_samplerates;
 
-       /* Device/capture settings */
        uint64_t cur_samplerate;
+       uint64_t limit_frames;
        uint64_t limit_samples;
        uint64_t capture_ratio;
 
-       /* Operational settings */
        gboolean trigger_fired;
        gboolean acq_aborted;
        gboolean sample_wide;
        struct soft_trigger_logic *stl;
 
-       unsigned int sent_samples;
+       uint64_t num_frames;
+       uint64_t sent_samples;
        int submitted_transfers;
        int empty_transfer_count;
 
@@ -126,17 +125,9 @@ struct dev_context {
        float *analog_buffer;
 };
 
-SR_PRIV int fx2lafw_command_start_acquisition(const struct sr_dev_inst *sdi);
 SR_PRIV int fx2lafw_dev_open(struct sr_dev_inst *sdi, struct sr_dev_driver *di);
 SR_PRIV struct dev_context *fx2lafw_dev_new(void);
+SR_PRIV int fx2lafw_start_acquisition(const struct sr_dev_inst *sdi);
 SR_PRIV void fx2lafw_abort_acquisition(struct dev_context *devc);
-SR_PRIV void LIBUSB_CALL fx2lafw_receive_transfer(struct libusb_transfer *transfer);
-SR_PRIV size_t fx2lafw_get_buffer_size(struct dev_context *devc);
-SR_PRIV unsigned int fx2lafw_get_number_of_transfers(struct dev_context *devc);
-SR_PRIV unsigned int fx2lafw_get_timeout(struct dev_context *devc);
-SR_PRIV void la_send_data_proc(struct sr_dev_inst *sdi, uint8_t *data,
-               size_t length, size_t sample_width);
-SR_PRIV void mso_send_data_proc(struct sr_dev_inst *sdi, uint8_t *data,
-               size_t length, size_t sample_width);
 
 #endif