The code supports single shot capturing data and transferring that
to the PC. Sample memory depth is for now fixed at 14K/7K samples.
---
 hardware/rigol-ds/api.c      |   33 ++++-
 hardware/rigol-ds/protocol.c |  337 ++++++++++++++++++++++++++++++++----------
 hardware/rigol-ds/protocol.h |   23 ++-
 3 files changed, 303 insertions(+), 90 deletions(-)

diff --git a/hardware/rigol-ds/api.c b/hardware/rigol-ds/api.c
index 37dc9d0..20f970c 100644
--- a/hardware/rigol-ds/api.c
+++ b/hardware/rigol-ds/api.c
@@ -647,8 +647,16 @@ static int dev_acquisition_start(const struct sr_dev_inst 
*sdi, void *cb_data)
        serial = sdi->conn;
        devc = sdi->priv;
 
-       if (devc->data_source != DATA_SOURCE_LIVE) {
-               sr_err("Only data source Live supported for now");
+       if (devc->data_source == DATA_SOURCE_LIVE) {
+               if (rigol_ds_send(sdi, ":RUN") != SR_OK)
+                       return SR_ERR;
+       } else if (devc->data_source == DATA_SOURCE_MEMORY) {
+               if (devc->model->series != RIGOL_DS2000) {
+                       sr_err("Data source 'Memory' not supported for this 
device");
+                       return SR_ERR;
+               }
+       } else if (devc->data_source == DATA_SOURCE_SEGMENTED) {
+               sr_err("Data source 'Segmented' not yet supported");
                return SR_ERR;
        }
 
@@ -690,6 +698,7 @@ static int dev_acquisition_start(const struct sr_dev_inst 
*sdi, void *cb_data)
        if (devc->model->protocol == PROTOCOL_LEGACY) {
                /* Fetch the first frame. */
                if (devc->enabled_analog_probes) {
+                       devc->analog_frame_size = 
DS1000_ANALOG_LIVE_WAVEFORM_SIZE;
                        devc->channel_frame = devc->enabled_analog_probes->data;
                        if (rigol_ds_send(sdi, ":WAV:DATA? CHAN%d",
                                        devc->channel_frame->index + 1) != 
SR_OK)
@@ -703,9 +712,25 @@ static int dev_acquisition_start(const struct sr_dev_inst 
*sdi, void *cb_data)
                devc->num_frame_bytes = 0;
        } else {
                if (devc->enabled_analog_probes) {
+                       if (devc->data_source == DATA_SOURCE_MEMORY)
+                       {
+                               if (g_slist_length(devc->enabled_analog_probes) 
== 1)
+                                       devc->analog_frame_size = 
DS2000_ANALOG_MEM_WAVEFORM_SIZE_1C;
+                               else
+                                       devc->analog_frame_size = 
DS2000_ANALOG_MEM_WAVEFORM_SIZE_2C;
+                               /* Apparently for the DS2000 the memory
+                                * depth can only be set in Running state -
+                                * this matches the behaviour of the UI. */
+                               if (rigol_ds_send(sdi, ":RUN") != SR_OK)
+                                       return SR_ERR;
+                               if (rigol_ds_send(sdi, "ACQ:MDEP %d", 
devc->analog_frame_size) != SR_OK)
+                                       return SR_ERR;
+                               if (rigol_ds_send(sdi, ":STOP") != SR_OK)
+                                       return SR_ERR;
+                       } else
+                               devc->analog_frame_size = 
DS2000_ANALOG_LIVE_WAVEFORM_SIZE;
                        devc->channel_frame = devc->enabled_analog_probes->data;
-                       /* Assume there already was a trigger event - don't 
wait */
-                       if (rigol_ds_acquisition_start(sdi, FALSE) != SR_OK)
+                       if (rigol_ds_capture_start(sdi) != SR_OK)
                                return SR_ERR;
                }
        }
diff --git a/hardware/rigol-ds/protocol.c b/hardware/rigol-ds/protocol.c
index 912c2e9..f0101e7 100644
--- a/hardware/rigol-ds/protocol.c
+++ b/hardware/rigol-ds/protocol.c
@@ -91,41 +91,29 @@ static int parse_int(const char *str, int *ret)
        return SR_OK;
 }
 
+/* Set the next event to wait for in rigol_ds_receive */
+static void rigol_ds_set_wait_event(struct dev_context *devc, enum wait_events 
event)
+{
+       if (event == WAIT_STOP)
+               devc->wait_status = 2;
+       else
+               devc->wait_status = 1;
+       devc->wait_event = event;
+}
+
 /*
- * Waiting for a trigger event will return a timeout after 2, 3 seconds in
- * order to not block the application.
+ * Waiting for a event will return a timeout after 2 to 3 seconds in order
+ * to not block the application.
  */
-
-static int rigol_ds_trigger_wait(const struct sr_dev_inst *sdi)
+static int rigol_ds_event_wait(const struct sr_dev_inst *sdi, char status1, 
char status2)
 {
        char buf[20];
        struct dev_context *devc;
        time_t start;
-       long s;
 
        if (!(devc = sdi->priv))
                return SR_ERR;
 
-       /* 
-        * If timebase < 50 msecs/DIV just sleep about one sweep time except
-        * for really fast sweeps.
-        */
-       if (devc->trigger_wait_status == 1 && devc->timebase < 0.0499)
-       {
-               if (devc->timebase > 0.99e-6) {
-                       /*
-                        * Timebase * num hor. divs * 85(%) * 1e6(usecs) / 100
-                        * -> 85 percent of sweep time
-                        */
-                       s = (devc->timebase * devc->model->num_horizontal_divs
-                            * 85e6) / 100L;
-                       sr_spew("Sleeping for %ld usecs instead of 
trigger-wait", s);
-                       g_usleep(s);
-               }
-               devc->trigger_wait_status = 0;
-               return SR_OK;
-       }
-
        start = time(NULL);
 
        /*
@@ -137,7 +125,7 @@ static int rigol_ds_trigger_wait(const struct sr_dev_inst 
*sdi)
         * "STOP"        - stopped
         */
 
-       if (devc->trigger_wait_status == 1) {
+       if (devc->wait_status == 1) {
                do {
                        if (time(NULL) - start >= 3) {
                                sr_dbg("Timeout waiting for trigger");
@@ -146,11 +134,11 @@ static int rigol_ds_trigger_wait(const struct sr_dev_inst 
*sdi)
 
                        if (get_cfg(sdi, ":TRIG:STAT?", buf, sizeof(buf)) != 
SR_OK)
                                return SR_ERR;
-               } while (buf[0] == 'T' || buf[0] == 'A');
+               } while (buf[0] == status1 || buf[0] == status2);
 
-               devc->trigger_wait_status = 2;
+               devc->wait_status = 2;
        }
-       if (devc->trigger_wait_status == 2) {
+       if (devc->wait_status == 2) {
                do {
                        if (time(NULL) - start >= 3) {
                                sr_dbg("Timeout waiting for trigger");
@@ -159,20 +147,20 @@ static int rigol_ds_trigger_wait(const struct sr_dev_inst 
*sdi)
 
                        if (get_cfg(sdi, ":TRIG:STAT?", buf, sizeof(buf)) != 
SR_OK)
                                return SR_ERR;
-               } while (buf[0] != 'T' && buf[0] != 'A');
+               } while (buf[0] != status1 && buf[0] != status2);
 
-               devc->trigger_wait_status = 0;
+               rigol_ds_set_wait_event(devc, WAIT_NONE);
        }
 
        return SR_OK;
 }
 
 /*
- * This needs to wait for a new trigger event to ensure that sample data is
- * not returned twice.
+ * For live capture we need to wait for a new trigger event to ensure that
+ * sample data is not returned twice.
  *
  * Unfortunately this will never really work because for sufficiently fast
- * timebases it just can't catch the status changes.
+ * timebases and trigger rates it just can't catch the status changes.
  *
  * What would be needed is a trigger event register with autoreset like the
  * Agilents have. The Rigols don't seem to have anything like this.
@@ -180,41 +168,184 @@ static int rigol_ds_trigger_wait(const struct 
sr_dev_inst *sdi)
  * The workaround is to only wait for the trigger when the timebase is slow
  * enough. Of course this means that for faster timebases sample data can be
  * returned multiple times, this effect is mitigated somewhat by sleeping
- * for about one sweep time.
+ * for about one sweep time in that case.
  */
-
-SR_PRIV int rigol_ds_acquisition_start(const struct sr_dev_inst *sdi,
-                                      gboolean wait_for_trigger)
+static int rigol_ds_trigger_wait(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
+       long s;
 
        if (!(devc = sdi->priv))
                return SR_ERR;
 
-       sr_dbg("Starting acquisition on channel %d",
-                  devc->channel_frame->index + 1);
+       /* 
+        * If timebase < 50 msecs/DIV just sleep about one sweep time except
+        * for really fast sweeps.
+        */
+       if (devc->timebase < 0.0499)
+       {
+               if (devc->timebase > 0.99e-6) {
+                       /*
+                        * Timebase * num hor. divs * 85(%) * 1e6(usecs) / 100
+                        * -> 85 percent of sweep time
+                        */
+                       s = (devc->timebase * devc->model->num_horizontal_divs
+                            * 85e6) / 100L;
+                       sr_spew("Sleeping for %ld usecs instead of 
trigger-wait", s);
+                       g_usleep(s);
+               }
+               rigol_ds_set_wait_event(devc, WAIT_NONE);
+               return SR_OK;
+       } else {
+               return rigol_ds_event_wait(sdi, 'T', 'A');
+       }
+}
 
-       if (rigol_ds_send(sdi, ":WAV:FORM BYTE") != SR_OK)
+/* Wait for scope to got to "Stop" in single shot mode */
+static int rigol_ds_stop_wait(const struct sr_dev_inst *sdi)
+{
+       return rigol_ds_event_wait(sdi, 'S', 'S');
+}
+
+/* Check that a single shot acquisition actually succeeded on the DS2000 */
+static int rigol_ds_check_stop(const struct sr_dev_inst *sdi)
+{
+       struct dev_context *devc;
+       int tmp;
+
+       if (!(devc = sdi->priv))
                return SR_ERR;
+
        if (rigol_ds_send(sdi, ":WAV:SOUR CHAN%d",
-                             devc->channel_frame->index + 1) != SR_OK)
+                         devc->channel_frame->index + 1) != SR_OK)
                return SR_ERR;
-       if (rigol_ds_send(sdi, ":WAV:MODE NORM") != SR_OK)
+       /* Check that the number of samples will be accepted */
+       if (rigol_ds_send(sdi, ":WAV:POIN %d;*OPC", devc->analog_frame_size) != 
SR_OK)
                return SR_ERR;
+       if (get_cfg_int(sdi, "*ESR?", &tmp) != SR_OK)
+               return SR_ERR;
+       /*
+        * If we get an "Execution error" the scope went from "Single" to
+        * "Stop" without actually triggering. There is no waveform
+        * displayed and trying to download one will fail - the scope thinks
+        * it has 1400 samples (like display memory) and the driver thinks
+        * it has a different number of samples.
+        *
+        * In that case just try to capture something again. Might still
+        * fail in interesting ways.
+        *
+        * Ain't firmware fun?
+        */
+       if (tmp & 0x10) {
+               sr_warn("Single shot acquisition failed, retrying...");
+               /* Sleep a bit, otherwise the single shot will often fail */
+               g_usleep(500000);
+               rigol_ds_send(sdi, ":SING");
+               rigol_ds_set_wait_event(devc, WAIT_STOP);
+               return SR_ERR;
+       }
 
-       devc->num_frame_bytes = 0;
-       devc->num_block_bytes = 0;
+       return SR_OK;
+}
 
-       if (wait_for_trigger)
-       {
-               devc->trigger_wait_status = 1;
+/* Wait for enough data becoming available in scope output buffer */
+static int rigol_ds_block_wait(const struct sr_dev_inst *sdi)
+{
+       char buf[30];
+       struct dev_context *devc;
+       time_t start;
+       int len;
+
+       if (!(devc = sdi->priv))
+               return SR_ERR;
+
+       start = time(NULL);
+
+       do {
+               if (time(NULL) - start >= 3) {
+                       sr_dbg("Timeout waiting for data block");
+                       return SR_ERR_TIMEOUT;
+               }
+
+               /*
+                * The scope copies data really slowly from sample
+                * memory to its output buffer, so try not to bother
+                * it too much with SCPI requests but don't wait too
+                * long for short sample frame sizes.
+                */
+               g_usleep(devc->analog_frame_size < 15000 ? 100000 : 1000000);
+
+               /* "READ,nnnn" (still working) or "IDLE,nnnn" (finished) */
+               if (get_cfg(sdi, ":WAV:STAT?", buf, sizeof(buf)) != SR_OK)
+                       return SR_ERR;
+
+               if (parse_int(buf + 5, &len) != SR_OK)
+                       return SR_ERR;
+       } while (buf[0] == 'R' && len < 1000000);
+
+       rigol_ds_set_wait_event(devc, WAIT_NONE);
+
+       return SR_OK;
+}
+
+/* Start capturing a new frameset */
+SR_PRIV int rigol_ds_capture_start(const struct sr_dev_inst *sdi)
+{
+       struct dev_context *devc;
+
+       if (!(devc = sdi->priv))
+               return SR_ERR;
+
+       sr_dbg("Starting data capture for frameset %lu of %lu",
+              devc->num_frames + 1, devc->limit_frames);
+
+       if (rigol_ds_send(sdi, ":WAV:FORM BYTE") != SR_OK)
+               return SR_ERR;
+       if (devc->data_source == DATA_SOURCE_LIVE) {
+               if (rigol_ds_send(sdi, ":WAV:MODE NORM") != SR_OK)
+                       return SR_ERR;
+               rigol_ds_set_wait_event(devc, WAIT_TRIGGER);
        } else {
-               devc->trigger_wait_status = 0;
+               if (rigol_ds_send(sdi, ":WAV:MODE RAW") != SR_OK)
+                       return SR_ERR;
+               if (rigol_ds_send(sdi, ":SING", devc->analog_frame_size) != 
SR_OK)
+                       return SR_ERR;          
+               rigol_ds_set_wait_event(devc, WAIT_STOP);
        }
 
        return SR_OK;
 }
 
+/* Start reading data from the current channel */
+SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi)
+{
+       struct dev_context *devc;
+
+       if (!(devc = sdi->priv))
+               return SR_ERR;
+
+       sr_dbg("Starting reading data from channel %d",
+              devc->channel_frame->index + 1);
+
+       if (rigol_ds_send(sdi, ":WAV:SOUR CHAN%d",
+                         devc->channel_frame->index + 1) != SR_OK)
+               return SR_ERR;
+       if (devc->data_source != DATA_SOURCE_LIVE) {
+               if (rigol_ds_send(sdi, ":WAV:RES") != SR_OK)
+                       return SR_ERR;
+               if (rigol_ds_send(sdi, ":WAV:BEG") != SR_OK)
+                       return SR_ERR;
+               rigol_ds_set_wait_event(devc, WAIT_BLOCK);
+       } else
+               rigol_ds_set_wait_event(devc, WAIT_NONE);
+
+       devc->num_frame_bytes = 0;
+       devc->num_block_bytes = 0;
+
+       return SR_OK;
+}
+
+/* Read the header of a data block */
 static int rigol_ds_read_header(struct sr_serial_dev_inst *serial)
 {
        char start[3], length[10];
@@ -277,41 +408,68 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void 
*cb_data)
        serial = sdi->conn;
 
        if (revents == G_IO_IN) {
-               if (devc->trigger_wait_status > 0) {
-                       if (rigol_ds_trigger_wait(sdi) != SR_OK)
-                               return TRUE;
-               }
+               if (devc->model->protocol == PROTOCOL_IEEE488_2) {
+                       switch(devc->wait_event) {
+                       case WAIT_NONE:
+                               break;
 
-               if (devc->model->protocol == PROTOCOL_IEEE488_2
-                   && devc->num_block_bytes == 0) {
-                       sr_dbg("New block header expected");
-                       if (rigol_ds_send(sdi, ":WAV:DATA?") != SR_OK)
-                               return TRUE;
-                       len = rigol_ds_read_header(serial);
-                       if (len == -1)
-                               return TRUE;
-                       /* At slow timebases the DS2072 sometimes returns
-                        * "short" data blocks, with apparently no way to
-                        * get the rest of the data. Discard these, the
-                        * complete data block will appear eventually.
-                        */
-                       if (len < DS2000_ANALOG_WAVEFORM_SIZE) {
-                               sr_dbg("Discarding short data block");
-                               serial_read(serial, devc->buffer, len + 1);
+                       case WAIT_TRIGGER:
+                               if (rigol_ds_trigger_wait(sdi) != SR_OK)
+                                       return TRUE;
+                               if (rigol_ds_channel_start(sdi) != SR_OK)
+                                       return TRUE;
+                               break;
+
+                       case WAIT_BLOCK:
+                               if (rigol_ds_block_wait(sdi) != SR_OK)
+                                       return TRUE;
+                               break;
+
+                       case WAIT_STOP:
+                               if (rigol_ds_stop_wait(sdi) != SR_OK)
+                                       return TRUE;
+                               if (rigol_ds_check_stop(sdi) != SR_OK)
+                                       return TRUE;
+                               if (rigol_ds_channel_start(sdi) != SR_OK)
+                                       return TRUE;
                                return TRUE;
+
+                       default:
+                               sr_err("BUG: Unknown event target encountered");
+                       }
+               
+                       if (devc->num_block_bytes == 0) {
+                               sr_dbg("New block header expected");
+                               if (rigol_ds_send(sdi, ":WAV:DATA?") != SR_OK)
+                                       return TRUE;
+                               len = rigol_ds_read_header(serial);
+                               if (len == -1)
+                                       return TRUE;
+                               /* At slow timebases in live capture the DS2072
+                                * sometimes returns "short" data blocks, with
+                                * apparently no way to get the rest of the 
data.
+                                * Discard these, the complete data block will
+                                * appear eventually.
+                                */
+                               if (devc->data_source == DATA_SOURCE_LIVE
+                                   && (unsigned)len < devc->num_frame_bytes) {
+                                       sr_dbg("Discarding short data block");
+                                       serial_read(serial, devc->buffer, len + 
1);
+                                       return TRUE;
+                               }
+                               devc->num_block_bytes = len;
+                               devc->num_block_read = 0;
                        }
-                       devc->num_block_bytes = len;
-                       devc->num_block_read = 0;
                }
 
                probe = devc->channel_frame;
                if (devc->model->protocol == PROTOCOL_IEEE488_2) {
                        len = devc->num_block_bytes - devc->num_block_read;
                        len = serial_read(serial, devc->buffer,
-                                       len < DS2000_ANALOG_WAVEFORM_SIZE ? len 
: DS2000_ANALOG_WAVEFORM_SIZE);
+                                       len < ACQ_BUFFER_SIZE ? len : 
ACQ_BUFFER_SIZE);
                } else {
                        waveform_size = probe->type == SR_PROBE_ANALOG ?
-                                       DS1000_ANALOG_WAVEFORM_SIZE : 
DIGITAL_WAVEFORM_SIZE;
+                                       DS1000_ANALOG_LIVE_WAVEFORM_SIZE : 
DIGITAL_WAVEFORM_SIZE;
                        len = serial_read(serial, devc->buffer, waveform_size - 
devc->num_frame_bytes);
                }
                sr_dbg("Received %d bytes.", len);
@@ -348,15 +506,26 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void 
*cb_data)
                        g_slist_free(analog.probes);
 
                        if (devc->model->protocol == PROTOCOL_IEEE488_2) {
+                               if (devc->num_block_read == 
devc->num_block_bytes) {
+                                       sr_dbg("Block has been completed");
+                                       /* Discard the terminating linefeed and 
prepare for
+                                          possible next block */
+                                       serial_read(serial, devc->buffer, 1);
+                                       devc->num_block_bytes = 0;
+                                       if (devc->data_source != 
DATA_SOURCE_LIVE)
+                                               rigol_ds_set_wait_event(devc, 
WAIT_BLOCK);
+                               } else
+                                       sr_dbg("%d of %d block bytes read", 
devc->num_block_read, devc->num_block_bytes);
+
                                devc->num_frame_bytes += len;
 
-                               if (devc->num_frame_bytes < 
DS2000_ANALOG_WAVEFORM_SIZE)
+                               if (devc->num_frame_bytes < 
devc->analog_frame_size)
                                        /* Don't have the whole frame yet. */
                                        return TRUE;
 
                                sr_dbg("Frame completed, %d samples", 
devc->num_frame_bytes);
                        } else {
-                               if (len != DS1000_ANALOG_WAVEFORM_SIZE)
+                               if (len != DS1000_ANALOG_LIVE_WAVEFORM_SIZE)
                                        /* Don't have the whole frame yet. */
                                        return TRUE;
                        }
@@ -378,6 +547,16 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void 
*cb_data)
                sr_session_send(sdi, &packet);
                if (devc->model->protocol == PROTOCOL_LEGACY)
                        devc->num_frame_bytes = 0;
+               else {
+                       /* Signal end of data download to scope */
+                       if (devc->data_source != DATA_SOURCE_LIVE)
+                               /*
+                                * This causes a query error, without it 
switching
+                                * to the next channel causes an error. Fun with
+                                * firmware...
+                                */
+                               rigol_ds_send(sdi, ":WAV:END");
+               }
 
                if (devc->enabled_analog_probes
                                && devc->channel_frame == 
devc->enabled_analog_probes->data
@@ -386,8 +565,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void 
*cb_data)
                         * there's a second analog channel. */
                        devc->channel_frame = 
devc->enabled_analog_probes->next->data;
                        if (devc->model->protocol == PROTOCOL_IEEE488_2) {
-                               /* Do not wait for trigger to try and keep 
channel data related. */
-                               rigol_ds_acquisition_start(sdi, FALSE);
+                               rigol_ds_channel_start(sdi);
                        } else {
                                rigol_ds_send(sdi, ":WAV:DATA? CHAN%c",
                                                devc->channel_frame->name[2]);
@@ -407,10 +585,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void 
*cb_data)
                                if (devc->model->protocol == 
PROTOCOL_IEEE488_2) {
                                        if (devc->enabled_analog_probes) {
                                                devc->channel_frame = 
devc->enabled_analog_probes->data;
-                                               /* Must wait for trigger 
because at
-                                                * slow timebases the scope will
-                                                * return old data otherwise. */
-                                               rigol_ds_acquisition_start(sdi, 
TRUE);
+                                               rigol_ds_capture_start(sdi);
                                        }
                                } else {
                                        if (devc->enabled_analog_probes) {
diff --git a/hardware/rigol-ds/protocol.h b/hardware/rigol-ds/protocol.h
index 09e29ad..db12543 100644
--- a/hardware/rigol-ds/protocol.h
+++ b/hardware/rigol-ds/protocol.h
@@ -35,8 +35,11 @@
 #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 DS1000_ANALOG_LIVE_WAVEFORM_SIZE 600
+#define DS2000_ANALOG_LIVE_WAVEFORM_SIZE 1400
+/* 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
@@ -73,6 +76,13 @@ struct rigol_ds_model {
        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. */
 struct dev_context {
        /* Device model */
@@ -90,6 +100,7 @@ struct dev_context {
        uint64_t limit_frames;
        void *cb_data;
        enum data_source data_source;
+       uint64_t analog_frame_size;
 
        /* Device settings */
        gboolean analog_channels[2];
@@ -112,14 +123,16 @@ struct dev_context {
        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_ds_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_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);
-- 
1.7.10.4


------------------------------------------------------------------------------
Shape the Mobile Experience: Free Subscription
Software experts and developers: Be at the forefront of tech innovation.
Intel(R) Software Adrenaline delivers strategic insight and game-changing 
conversations that shape the rapidly evolving mobile landscape. Sign up now. 
http://pubads.g.doubleclick.net/gampad/clk?id=63431311&iu=/4140/ostg.clktrk
_______________________________________________
sigrok-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/sigrok-devel

Reply via email to