SR_DF_ANALOG_OLD and sr_datafeed_analog_old renames.

[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..7938e9e516d597037c0e61985df16c970e9e1df4 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,
@@ -180,19 +180,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;