X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Frigol-ds%2Fprotocol.h;h=0117628ca04e72e6451d4b5680c670889db19497;hb=3f239f0803b9fbc073dd7abe9fc7b2a0c606fbb6;hp=458ae3be73041a77fe8af2590f31ab78dedcf82a;hpb=56d0d24535700fb53e47a25ad5c73d34697695fa;p=libsigrok.git

diff --git a/hardware/rigol-ds/protocol.h b/hardware/rigol-ds/protocol.h
index 458ae3be..0117628c 100644
--- a/hardware/rigol-ds/protocol.h
+++ b/hardware/rigol-ds/protocol.h
@@ -31,8 +31,8 @@
 /* Size of acquisition buffers */
 #define ACQ_BUFFER_SIZE 32768
 
-#define MAX_ANALOG_PROBES 4
-#define MAX_DIGITAL_PROBES 16
+#define MAX_ANALOG_CHANNELS 4
+#define MAX_DIGITAL_CHANNELS 16
 
 enum protocol_version {
 	PROTOCOL_V1, /* VS5000 */
@@ -98,7 +98,7 @@ struct dev_context {
 	uint64_t num_vdivs;
 
 	/* Channel groups */
-	struct sr_channel_group analog_groups[MAX_ANALOG_PROBES];
+	struct sr_channel_group analog_groups[MAX_ANALOG_CHANNELS];
 	struct sr_channel_group digital_group;
 
 	/* Acquisition settings */
@@ -111,17 +111,17 @@ struct dev_context {
 	uint64_t digital_frame_size;
 
 	/* Device settings */
-	gboolean analog_channels[MAX_ANALOG_PROBES];
-	gboolean digital_channels[MAX_DIGITAL_PROBES];
+	gboolean analog_channels[MAX_ANALOG_CHANNELS];
+	gboolean digital_channels[MAX_DIGITAL_CHANNELS];
 	gboolean la_enabled;
 	float timebase;
-	float vdiv[MAX_ANALOG_PROBES];
-	int vert_reference[MAX_ANALOG_PROBES];
-	float vert_offset[MAX_ANALOG_PROBES];
+	float vdiv[MAX_ANALOG_CHANNELS];
+	int vert_reference[MAX_ANALOG_CHANNELS];
+	float vert_offset[MAX_ANALOG_CHANNELS];
 	char *trigger_source;
 	float horiz_triggerpos;
 	char *trigger_slope;
-	char *coupling[MAX_ANALOG_PROBES];
+	char *coupling[MAX_ANALOG_CHANNELS];
 
 	/* Operational state */