Attachment 399 Details for Bug 1011 – bug1011-patch-v1

[patch] bug1011-patch-v1

bug1011-patch-v1.diff (text/plain), 1.48 KB, created by Aleksander Alsekseev on 2018-03-20 21:54:33 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Aleksander Alsekseev

Created: 2018-03-20 21:54:33 CET

Size: 1.48 KB

patch

obsolete

>diff --git a/src/hardware/rigol-ds/protocol.c b/src/hardware/rigol-ds/protocol.c
>index d21008b6..51fcb3f5 100644
>--- a/src/hardware/rigol-ds/protocol.c
>+++ b/src/hardware/rigol-ds/protocol.c
>@@ -631,7 +631,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
> 				/* Still reading the header. */
> 				return TRUE;
> 			if (len == -1) {
>-				sr_err("Read error, aborting capture.");
>+				sr_err("Error during reading a header, aborting capture.");
> 				packet.type = SR_DF_FRAME_END;
> 				sr_session_send(sdi, &packet);
> 				sr_dev_acquisition_stop(sdi);
>@@ -643,10 +643,12 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
> 			 * Discard these, the complete data block will
> 			 * appear eventually.
> 			 */
>-			if (devc->data_source == DATA_SOURCE_LIVE
>+			if (/*(strcmp(devc->model->name, "DS1104Z") != 0)
>+                    && */ devc->data_source == DATA_SOURCE_LIVE
> 					&& (unsigned)len < expected_data_bytes) {
> 				sr_dbg("Discarding short data block");
> 				sr_scpi_read_data(scpi, (char *)devc->buffer, len + 1);
>+				devc->num_header_bytes = 0;
> 				return TRUE;
> 			}
> 			devc->num_block_bytes = len;
>@@ -664,7 +666,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
> 	len = sr_scpi_read_data(scpi, (char *)devc->buffer, len);
> 
> 	if (len == -1) {
>-		sr_err("Read error, aborting capture.");
>+		sr_err("Error during reading data, aborting capture.");
> 		packet.type = SR_DF_FRAME_END;
> 		sr_session_send(sdi, &packet);
> 		sr_dev_acquisition_stop(sdi);

Actions: View

Attachments on bug 1011: 399