dev_acquisition_{start,stop}(): Drop duplicate 'cb_data' parameter.

[libsigrok.git] / src / hardware / hantek-dso / dso.h

diff --git a/src/hardware/hantek-dso/dso.h b/src/hardware/hantek-dso/dso.h
index edccb725cf3830bc873833e6e4856e3468392a59..78e438bd62537d0fcfb1ce99bbe2a57932c7f28e 100644 (file)
--- a/src/hardware/hantek-dso/dso.h
+++ b/src/hardware/hantek-dso/dso.h
@@ -49,7 +49,7 @@
 #define EEPROM_CHANNEL_OFFSETS  0x08
 
 /* All models have this for their "fast" mode. */
-#define FRAMESIZE_SMALL         10240
+#define FRAMESIZE_SMALL         (10 * 1024)
 
 enum control_requests {
        CTRL_READ_EEPROM = 0xa2,
@@ -154,15 +154,14 @@ struct dso_profile {
        /* VID/PID after firmware upload */
        uint16_t fw_vid;
        uint16_t fw_pid;
-       char *vendor;
-       char *model;
+       const char *vendor;
+       const char *model;
        const uint64_t *buffersizes;
-       char *firmware;
+       const char *firmware;
 };
 
 struct dev_context {
        const struct dso_profile *profile;
-       void *cb_data;
        uint64_t limit_frames;
        uint64_t num_frames;
        GSList *enabled_channels;
@@ -180,19 +179,15 @@ struct dev_context {
        int timebase;
        gboolean ch1_enabled;
        gboolean ch2_enabled;
-       int voltage_ch1;
-       int voltage_ch2;
-       int coupling_ch1;
-       int coupling_ch2;
+       int voltage[2];
+       int coupling[2];
        // voltage offset (vertical position)
        float voffset_ch1;
        float voffset_ch2;
        float voffset_trigger;
        uint16_t channel_levels[2][9][2];
        unsigned int framesize;
-       gboolean filter_ch1;
-       gboolean filter_ch2;
-       gboolean filter_trigger;
+       gboolean filter[2];
        int triggerslope;
        char *triggersource;
        float triggerposition;