hantek-dso: fix channel selection

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

diff --git a/hardware/hantek-dso/dso.h b/hardware/hantek-dso/dso.h
index 6e35a985859e53cfd7b272621431dd76f580356d..1a0c69deb4326ee2884b704e13cebbc2b4f528a0 100644 (file)
--- a/hardware/hantek-dso/dso.h
+++ b/hardware/hantek-dso/dso.h
@@ -37,7 +37,6 @@
 #define DEFAULT_TIMEBASE           TIME_1ms
 #define DEFAULT_TRIGGER_SOURCE     TRIGGER_CH1
 #define DEFAULT_COUPLING           COUPLING_AC
-#define DEFAULT_SELECTED_CHANNEL   SELECT_CH1CH2
 /* Halfway between min and max = 0V */
 #define DEFAULT_HORIZ_TRIGGERPOS   0x1400
 
@@ -123,12 +122,6 @@ enum trigger_sources {
        TRIGGER_EXT10
 };
 
-enum selected_channels {
-       SELECT_CH1 = 0,
-       SELECT_CH2,
-       SELECT_CH1CH2
-};
-
 enum capturestates {
        CAPTURE_EMPTY = 0,
        CAPTURE_FILLING = 1,
@@ -169,6 +162,8 @@ struct context {
        struct dso_profile *profile;
        struct sr_usb_dev_inst *usb;
        void *cb_data;
+       uint64_t limit_frames;
+       uint64_t num_frames;
        /* We can't keep track of an FX2-based device after upgrading
         * the firmware (it re-enumerates into a different device address
         * after the upgrade) this is like a global lock. No device will open
@@ -192,7 +187,6 @@ struct context {
        float voffset_ch2;
        float voffset_trigger;
        uint16_t channel_levels[2][9][2];
-       int selected_channel;
        int framesize;
        gboolean filter_ch1;
        gboolean filter_ch2;