rigol-ds: Add DS1000Z series support.

[libsigrok.git] / src / hardware / rigol-ds / protocol.h

diff --git a/src/hardware/rigol-ds/protocol.h b/src/hardware/rigol-ds/protocol.h
index 7bdf683d341568dfc3a8f05285370ce8de075310..631c81dbb8fab4dbe1a02d8467711b05e5c3975a 100644 (file)
--- a/src/hardware/rigol-ds/protocol.h
+++ b/src/hardware/rigol-ds/protocol.h
@@ -31,6 +31,9 @@
 /* Size of acquisition buffers */
 #define ACQ_BUFFER_SIZE 32768
 
+/* Maximum number of samples to retrieve at once. */
+#define ACQ_BLOCK_SIZE 30000
+
 #define MAX_ANALOG_CHANNELS 4
 #define MAX_DIGITAL_CHANNELS 16
 
@@ -38,6 +41,7 @@ enum protocol_version {
        PROTOCOL_V1, /* VS5000 */
        PROTOCOL_V2, /* DS1000 */
        PROTOCOL_V3, /* DS2000, DSO1000 */
+       PROTOCOL_V4, /* DS1000Z */
 };
 
 enum data_format {
@@ -102,8 +106,7 @@ struct dev_context {
        struct sr_channel_group *digital_group;
 
        /* Acquisition settings */
-       GSList *enabled_analog_channels;
-       GSList *enabled_digital_channels;
+       GSList *enabled_channels;
        uint64_t limit_frames;
        void *cb_data;
        enum data_source data_source;