X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Frigol-ds%2Fprotocol.h;h=86669b40de0ebbb6e5727d86340e136b4ad35604;hb=a90ffc373005b8ee506e5b69bcb9451233295d1b;hp=cdf43f8b2a9f883ca6b454ecd69714b3016aff91;hpb=934cf6cf5078f01517da303f21ed2ffee9b878f3;p=libsigrok.git

diff --git a/src/hardware/rigol-ds/protocol.h b/src/hardware/rigol-ds/protocol.h
index cdf43f8b..86669b40 100644
--- a/src/hardware/rigol-ds/protocol.h
+++ b/src/hardware/rigol-ds/protocol.h
@@ -74,12 +74,25 @@ struct rigol_ds_series {
 	int buffer_samples;
 };
 
+enum cmds {
+	CMD_GET_HORIZ_TRIGGERPOS,
+	CMD_SET_HORIZ_TRIGGERPOS,
+};
+
+struct rigol_ds_command {
+	int cmd;
+	const char *str;
+};
+
 struct rigol_ds_model {
 	const struct rigol_ds_series *series;
 	const char *name;
 	uint64_t min_timebase[2];
 	unsigned int analog_channels;
 	bool has_digital;
+	const char **trigger_sources;
+	unsigned int num_trigger_sources;
+	const struct rigol_ds_command *cmds;
 };
 
 enum wait_events {
@@ -89,9 +102,7 @@ enum wait_events {
 	WAIT_STOP,    /* Wait for scope stopping (only single shots) */
 };
 
-/** Private, per-device-instance driver context. */
 struct dev_context {
-	/* Device model */
 	const struct rigol_ds_model *model;
 	enum data_format format;
 
@@ -120,14 +131,15 @@ struct dev_context {
 	float attenuation[MAX_ANALOG_CHANNELS];
 	float vdiv[MAX_ANALOG_CHANNELS];
 	int vert_reference[MAX_ANALOG_CHANNELS];
+	float vert_origin[MAX_ANALOG_CHANNELS];
 	float vert_offset[MAX_ANALOG_CHANNELS];
+	float vert_inc[MAX_ANALOG_CHANNELS];
 	char *trigger_source;
 	float horiz_triggerpos;
 	char *trigger_slope;
+	float trigger_level;
 	char *coupling[MAX_ANALOG_CHANNELS];
 
-	/* Operational state */
-
 	/* Number of frames received in total. */
 	uint64_t num_frames;
 	/* GSList entry for the current channel. */