rigol-ds: Improve protocol debugging output, abort on read errors.

diff --git a/hardware/rigol-ds/protocol.c b/hardware/rigol-ds/protocol.c
index 8c66d63e8905aac57f493ceeb4f96d42b16bb005..fd8ba96beec1b4916c456f056f3262366ac23eb3 100644 (file)
--- a/hardware/rigol-ds/protocol.c
+++ b/hardware/rigol-ds/protocol.c
@@ -535,12 +535,16 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
                }
 
                len = devc->num_block_bytes - devc->num_block_read;
-               len = sr_scpi_read_data(scpi, (char *)devc->buffer,
-                               len < ACQ_BUFFER_SIZE ? len : ACQ_BUFFER_SIZE);
+               if (len > ACQ_BUFFER_SIZE)
+                       len = ACQ_BUFFER_SIZE;
+               sr_dbg("Requesting read of %d bytes", len);
+
+               len = sr_scpi_read_data(scpi, (char *)devc->buffer, len);
 
-               sr_dbg("Received %d bytes.", len);
                if (len == -1)
-                       return TRUE;
+                       return FALSE;
+
+               sr_dbg("Received %d bytes.", len);
 
                devc->num_block_read += len;