hantek-6xxx: Hantek 6022BE: Add VID/PID 04b5:6022 support.

[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 0c54ec92cf4a2e2583a4644fd68edef331ebd615..af66c70ef1b4a82092bd692f687d4d78af24e748 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 }, \
@@ -60,7 +60,11 @@
 #define FLUSH_PACKET_SIZE      1024
 
 #define MIN_PACKET_SIZE                512
+#ifdef _WIN32
+#define MAX_PACKET_SIZE                (2 * 1024 * 1024)
+#else
 #define MAX_PACKET_SIZE                (12 * 1024 * 1024)
+#endif
 
 #define HANTEK_EP_IN           0x86
 #define USB_INTERFACE          0
@@ -94,11 +98,13 @@ 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 {
@@ -116,17 +122,13 @@ struct dev_context {
        uint64_t aq_started;
 
        uint64_t read_start_ts;
-       uint32_t read_data_amount;
-
-       struct libusb_transfer **sample_buf;
-       uint32_t sample_buf_write;
-       uint32_t sample_buf_size;
 
        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;