X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=hardware%2Frigol-ds%2Fprotocol.h;h=0117628ca04e72e6451d4b5680c670889db19497;hp=2fe8d8653e99a80008f1a23a9f527a3600790de3;hb=43cd4637285833706f8a404ca027bcf0ee75b9ae;hpb=aff00e40880184c9f9d4a934d83af0cf052ed70c

diff --git a/hardware/rigol-ds/protocol.h b/hardware/rigol-ds/protocol.h
index 2fe8d865..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 */
@@ -97,13 +97,13 @@ struct dev_context {
 	const uint64_t (*vdivs)[2];
 	uint64_t num_vdivs;
 
-	/* Probe groups */
-	struct sr_probe_group analog_groups[MAX_ANALOG_PROBES];
-	struct sr_probe_group digital_group;
+	/* Channel groups */
+	struct sr_channel_group analog_groups[MAX_ANALOG_CHANNELS];
+	struct sr_channel_group digital_group;
 
 	/* Acquisition settings */
-	GSList *enabled_analog_probes;
-	GSList *enabled_digital_probes;
+	GSList *enabled_analog_channels;
+	GSList *enabled_digital_channels;
 	uint64_t limit_frames;
 	void *cb_data;
 	enum data_source data_source;
@@ -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 */