X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Frigol-ds%2Fprotocol.h;h=631c81dbb8fab4dbe1a02d8467711b05e5c3975a;hb=702f42e8eb33d8d1ffb5b748097428c0f4434c6d;hp=7bdf683d341568dfc3a8f05285370ce8de075310;hpb=c36f78f7728e8b5263bed440530a61caa6e30a26;p=libsigrok.git

diff --git a/src/hardware/rigol-ds/protocol.h b/src/hardware/rigol-ds/protocol.h
index 7bdf683d..631c81db 100644
--- 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;