sr_config_set(): Factor out SR_ERR_DEV_CLOSED check.

[libsigrok.git] / src / hardware / hantek-6xxx / protocol.h

diff --git a/src/hardware/hantek-6xxx/protocol.h b/src/hardware/hantek-6xxx/protocol.h
index c798a184dcdee6645e33c2162145586cda2b9d81..73d8f868da27430072a30b674ea96440ab27da22 100644 (file)
--- a/src/hardware/hantek-6xxx/protocol.h
+++ b/src/hardware/hantek-6xxx/protocol.h
@@ -31,7 +31,7 @@
 #define MAX_RENUM_DELAY_MS     3000
 
 #define DEFAULT_VOLTAGE                2
-#define DEFAULT_COUPLING        COUPLING_DC
+#define DEFAULT_COUPLING       COUPLING_DC
 #define DEFAULT_SAMPLERATE     SR_MHZ(8)
 
 #define NUM_CHANNELS           2
@@ -43,7 +43,7 @@
        SR_KHZ(100),
 
 #define SAMPLERATE_REGS \
-       48, 30, 24, 16, 8,  4, 1, 50, 20, 10,
+       48, 30, 24, 16, 8, 4, 1, 50, 20, 10,
 
 #define VDIV_VALUES \
        { 100, 1000 }, \
@@ -94,14 +94,17 @@ struct hantek_6xxx_profile {
        /* VID/PID after firmware upload */
        uint16_t fw_vid;
        uint16_t fw_pid;
+       uint16_t fw_prod_ver;
        const char *vendor;
        const char *model;
        const char *firmware;
+       const char **coupling_vals;
+       uint8_t coupling_tab_size;
+       gboolean has_coupling;
 };
 
 struct dev_context {
        const struct hantek_6xxx_profile *profile;
-       void *cb_data;
        GSList *enabled_channels;
        /*
         * We can't keep track of an FX2-based device after upgrading
@@ -124,6 +127,9 @@ struct dev_context {
        gboolean ch_enabled[NUM_CHANNELS];
        int voltage[NUM_CHANNELS];
        int coupling[NUM_CHANNELS];
+       const char **coupling_vals;
+       uint8_t coupling_tab_size;
+       gboolean has_coupling;
        uint64_t samplerate;
 
        uint64_t limit_msec;