X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Frigol-ds%2Fprotocol.h;h=f0bf04f2e36723c72bac7d4b5dbfad0c991d483a;hb=2588e50c63d08245547e9947e67b4247f9102b19;hp=cd49df5d4144b960f77b7718983aaf6a1475a184;hpb=bafd489094c42e626ee0b1964893a308751c50b7;p=libsigrok.git

diff --git a/hardware/rigol-ds/protocol.h b/hardware/rigol-ds/protocol.h
index cd49df5d..f0bf04f2 100644
--- a/hardware/rigol-ds/protocol.h
+++ b/hardware/rigol-ds/protocol.h
@@ -26,26 +26,63 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "rigol-ds: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
-
-#define DS1000_ANALOG_WAVEFORM_SIZE 600
-#define DS2000_ANALOG_WAVEFORM_SIZE 1400
+#define LOG_PREFIX "rigol-ds"
+
+#define DS1000_ANALOG_LIVE_WAVEFORM_SIZE 600
+#define DS2000_ANALOG_LIVE_WAVEFORM_SIZE 1400
+#define VS5000_ANALOG_LIVE_WAVEFORM_SIZE 2048
+#define DSO1000_ANALOG_LIVE_WAVEFORM_SIZE 600
+/* Needs to be made configurable later */
+#define DS2000_ANALOG_MEM_WAVEFORM_SIZE_1C 14000
+#define DS2000_ANALOG_MEM_WAVEFORM_SIZE_2C 7000
 #define DIGITAL_WAVEFORM_SIZE 1210
+/* Size of acquisition buffers */
+#define ACQ_BUFFER_SIZE 32768
+
+#define MAX_ANALOG_PROBES 4
+#define MAX_DIGITAL_PROBES 16
+
+enum rigol_ds_series {
+	RIGOL_DS1000,
+	RIGOL_DS1000Z,
+	RIGOL_DS2000,
+	RIGOL_DS4000,
+	RIGOL_DS6000,
+	RIGOL_VS5000,
+	AGILENT_DSO1000,
+};
+
+enum rigol_protocol_flavor {
+	/* Used by DS1000 and VS5000 series */
+	PROTOCOL_LEGACY,
+	/* Used by DS2000, DS4000, DS6000, ... series */
+	PROTOCOL_IEEE488_2,
+};
+
+enum data_source {
+	DATA_SOURCE_LIVE,
+	DATA_SOURCE_MEMORY,
+	DATA_SOURCE_SEGMENTED,
+};
 
 struct rigol_ds_model {
+	char *vendor;
 	char *name;
-	unsigned int series;
+	enum rigol_ds_series series;
+	enum rigol_protocol_flavor protocol;
 	uint64_t min_timebase[2];
 	uint64_t max_timebase[2];
 	uint64_t min_vdiv[2];
+	unsigned int analog_channels;
 	bool has_digital;
+	int num_horizontal_divs;
+};
+
+enum wait_events {
+	WAIT_NONE,    /* Don't wait */
+	WAIT_TRIGGER, /* Wait for trigger (only live capture) */
+	WAIT_BLOCK,   /* Wait for block data (only when reading sample mem) */
+	WAIT_STOP,    /* Wait for scope stopping (only single shots) */
 };
 
 /** Private, per-device-instance driver context. */
@@ -60,7 +97,7 @@ struct dev_context {
 	uint64_t num_vdivs;
 
 	/* Probe groups */
-	struct sr_probe_group analog_groups[2];
+	struct sr_probe_group analog_groups[MAX_ANALOG_PROBES];
 	struct sr_probe_group digital_group;
 
 	/* Acquisition settings */
@@ -68,35 +105,45 @@ struct dev_context {
 	GSList *enabled_digital_probes;
 	uint64_t limit_frames;
 	void *cb_data;
+	enum data_source data_source;
+	uint64_t analog_frame_size;
 
 	/* Device settings */
-	gboolean analog_channels[2];
-	gboolean digital_channels[16];
+	gboolean analog_channels[MAX_ANALOG_PROBES];
+	gboolean digital_channels[MAX_DIGITAL_PROBES];
 	float timebase;
-	float vdiv[2];
-	int vert_reference[2];
-	float vert_offset[2];
+	float vdiv[MAX_ANALOG_PROBES];
+	int vert_reference[MAX_ANALOG_PROBES];
+	float vert_offset[MAX_ANALOG_PROBES];
 	char *trigger_source;
 	float horiz_triggerpos;
 	char *trigger_slope;
-	char *coupling[2];
+	char *coupling[MAX_ANALOG_PROBES];
 
 	/* Operational state */
+
+	/* Number of frames received in total. */
 	uint64_t num_frames;
-	/* FIXME: misnomer, actually this is number of frame samples? */
-	uint64_t num_frame_bytes;
-	struct sr_probe *channel_frame;
+	/* GSList entry for the current channel. */
+	GSList *channel_entry;
+	/* Number of samples received in current frame. */
+	uint64_t num_frame_samples;
 	/* Number of bytes in current data block, if 0 block header expected */
 	uint64_t num_block_bytes;
 	/* Number of data block bytes already read */
 	uint64_t num_block_read;
-	/* Trigger waiting status, 0 - don't wait */
-	int trigger_wait_status;
+	/* What to wait for in *_receive */
+	enum wait_events wait_event;
+	/* Trigger/block copying/stop waiting status */
+	int wait_status;
+	/* Acq buffers used for reading from the scope and sending data to app */
+	unsigned char *buffer;
+	float *data;
 };
 
-SR_PRIV int rigol_ds2xx2_acquisition_start(const struct sr_dev_inst *sdi, gboolean wait_for_trigger);
+SR_PRIV int rigol_ds_capture_start(const struct sr_dev_inst *sdi);
+SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi);
 SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data);
-SR_PRIV int rigol_ds_send(const struct sr_dev_inst *sdi, const char *format, ...);
 SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi);
 
 #endif