Backport recent changes from mainline.

[libsigrok.git] / src / hardware / hung-chang-dso-2100 / protocol.h

diff --git a/src/hardware/hung-chang-dso-2100/protocol.h b/src/hardware/hung-chang-dso-2100/protocol.h
index 5636699a87b4126be9c2aeaa7f397bdf5a8e3b26..11de7b7254337946b68ea33edb1c2a5116971f80 100644 (file)
--- a/src/hardware/hung-chang-dso-2100/protocol.h
+++ b/src/hardware/hung-chang-dso-2100/protocol.h
@@ -26,12 +26,11 @@
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "hung-chang-dso-2100"
+
 #define MAX_RETRIES 4
 #define NUM_CHANNELS 2
 
-/** Private, per-device-instance driver context. */
 struct dev_context {
-       /* Acquisition settings */
        GSList *enabled_channel;
        uint8_t channel;
        uint8_t rate;
@@ -42,7 +41,6 @@ struct dev_context {
        uint8_t offset[2];
        uint8_t gain[2];
 
-       /* Operational state */
        uint64_t frame_limit;
        uint64_t frame;
        uint64_t probe[2];
@@ -51,8 +49,6 @@ struct dev_context {
        uint8_t retries;
        gboolean adc2;
 
-       /* Temporary state across callbacks */
-       void *cb_data;
        float *samples;
        float factor;
        gboolean state_known;
@@ -64,6 +60,5 @@ SR_PRIV void hung_chang_dso_2100_write_mbox(struct parport *port, uint8_t val);
 SR_PRIV uint8_t hung_chang_dso_2100_read_mbox(struct parport *port, float timeout);
 SR_PRIV int hung_chang_dso_2100_move_to(const struct sr_dev_inst *sdi, uint8_t target);
 SR_PRIV int hung_chang_dso_2100_poll(int fd, int revents, void *cb_data);
-SR_PRIV int hung_chang_dso_2100_dev_acquisition_stop(const struct sr_dev_inst *sdi, void *cb_data);
 
 #endif