rigol-ds: Improve short block handling

When a short block is received, clean up the header state so that the
next block can be read.

Based on a patch for #1011 by Aleksander Alsekseev.

diff --git a/src/hardware/rigol-ds/protocol.c b/src/hardware/rigol-ds/protocol.c
index 35d7b43457443a550991e1d81dd147b67915937d..fbbd03209cc1162e56464258707b269ca9ee2202 100644 (file)
--- a/src/hardware/rigol-ds/protocol.c
+++ b/src/hardware/rigol-ds/protocol.c
@@ -691,16 +691,17 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
                                sr_dev_acquisition_stop(sdi);
                                return TRUE;
                        }
-                       /* At slow timebases in live capture the DS2072
-                        * sometimes returns "short" data blocks, with
+                       /* At slow timebases in live capture the DS2072 and
+                        * DS1054Z sometimes return "short" data blocks, with
                         * apparently no way to get the rest of the data.
-                        * Discard these, the complete data block will
-                        * appear eventually.
+                        * Discard these, the complete data block will appear
+                        * eventually.
                         */
                        if (devc->data_source == DATA_SOURCE_LIVE
                                        && (unsigned)len < expected_data_bytes) {
-                               sr_dbg("Discarding short data block");
+                               sr_dbg("Discarding short data block: got %d/%d bytes\n", len, (int)expected_data_bytes);
                                sr_scpi_read_data(scpi, (char *)devc->buffer, len + 1);
+                               devc->num_header_bytes = 0;
                                return TRUE;
                        }
                        devc->num_block_bytes = len;