X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Frigol-ds%2Fprotocol.c;h=d609b06079dd14bc9a29c0a7535e4467fc4eb471;hb=91aea754aaed0f0f2a6fc4b2b875f0d0b7c01f8e;hp=9a05dea94f2da7d289e3af2977208951df3b8ebc;hpb=569d4dbd3e4c6cef0456c2afcc9a1e3d995d96ee;p=libsigrok.git

diff --git a/hardware/rigol-ds/protocol.c b/hardware/rigol-ds/protocol.c
index 9a05dea9..d609b060 100644
--- a/hardware/rigol-ds/protocol.c
+++ b/hardware/rigol-ds/protocol.c
@@ -207,7 +207,7 @@ static int rigol_ds_stop_wait(const struct sr_dev_inst *sdi)
 static int rigol_ds_check_stop(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
-	struct sr_probe *probe;
+	struct sr_channel *probe;
 	int tmp;
 
 	if (!(devc = sdi->priv))
@@ -261,29 +261,32 @@ static int rigol_ds_block_wait(const struct sr_dev_inst *sdi)
 	if (!(devc = sdi->priv))
 		return SR_ERR;
 
-	start = time(NULL);
+	if (devc->model->series->protocol >= PROTOCOL_V3) {
 
-	do {
-		if (time(NULL) - start >= 3) {
-			sr_dbg("Timeout waiting for data block");
-			return SR_ERR_TIMEOUT;
-		}
+		start = time(NULL);
 
-		/*
-		 * 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);
+		do {
+			if (time(NULL) - start >= 3) {
+				sr_dbg("Timeout waiting for data block");
+				return SR_ERR_TIMEOUT;
+			}
 
-		/* "READ,nnnn" (still working) or "IDLE,nnnn" (finished) */
-		if (sr_scpi_get_string(sdi->conn, ":WAV:STAT?", &buf) != SR_OK)
-			return SR_ERR;
+			/*
+			 * 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);
 
-		if (parse_int(buf + 5, &len) != SR_OK)
-			return SR_ERR;
-	} while (buf[0] == 'R' && len < 1000000);
+			/* "READ,nnnn" (still working) or "IDLE,nnnn" (finished) */
+			if (sr_scpi_get_string(sdi->conn, ":WAV:STAT?", &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);
 
@@ -373,7 +376,7 @@ 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)
 {
 	struct dev_context *devc;
-	struct sr_probe *probe;
+	struct sr_channel *probe;
 
 	if (!(devc = sdi->priv))
 		return SR_ERR;
@@ -401,51 +404,73 @@ SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi)
 				return SR_ERR;
 			if (rigol_ds_config_set(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);
+		}
 	}
 
+	rigol_ds_set_wait_event(devc, WAIT_BLOCK);
+
 	devc->num_channel_bytes = 0;
+	devc->num_header_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_scpi_dev_inst *scpi)
+static int rigol_ds_read_header(struct sr_dev_inst *sdi)
 {
-	char start[3], length[10];
-	int len, tmp;
-
-	/* Read the hashsign and length digit. */
-	tmp = sr_scpi_read_data(scpi, start, 2);
-	start[2] = '\0';
-	if (tmp != 2) {
-		sr_err("Failed to read first two bytes of data block header.");
-		return -1;
+	struct sr_scpi_dev_inst *scpi = sdi->conn;
+	struct dev_context *devc = sdi->priv;
+	char *buf = (char *) devc->buffer;
+	size_t header_length;
+	int ret;
+
+	/* Try to read the hashsign and length digit. */
+	if (devc->num_header_bytes < 2) {
+		ret = sr_scpi_read_data(scpi, buf + devc->num_header_bytes,
+				2 - devc->num_header_bytes);
+		if (ret < 0) {
+			sr_err("Read error while reading data header.");
+			return SR_ERR;
+		}
+		devc->num_header_bytes += ret;
 	}
-	if (start[0] != '#' || !isdigit(start[1]) || start[1] == '0') {
-		sr_err("Received invalid data block header start '%s'.", start);
-		return -1;
+
+	if (devc->num_header_bytes < 2)
+		return 0;
+
+	if (buf[0] != '#' || !isdigit(buf[1]) || buf[1] == '0') {
+		sr_err("Received invalid data block header '%c%c'.", buf[0], buf[1]);
+		return SR_ERR;
 	}
-	len = atoi(start + 1);
 
-	/* Read the data length. */
-	tmp = sr_scpi_read_data(scpi, length, len);
-	length[len] = '\0';
-	if (tmp != len) {
-		sr_err("Failed to read %d bytes of data block length.", len);
-		return -1;
+	header_length = 2 + buf[1] - '0';
+
+	/* Try to read the length. */
+	if (devc->num_header_bytes < header_length) {
+		ret = sr_scpi_read_data(scpi, buf + devc->num_header_bytes,
+				header_length - devc->num_header_bytes);
+		if (ret < 0) {
+			sr_err("Read error while reading data header.");
+			return SR_ERR;
+		}
+		devc->num_header_bytes += ret;
 	}
-	if (parse_int(length, &len) != SR_OK) {
-		sr_err("Received invalid data block length '%s'.", length);
+
+	if (devc->num_header_bytes < header_length)
+		return 0;
+
+	/* Read the data length. */
+	buf[header_length] = '\0';
+
+	if (parse_int(buf + 2, &ret) != SR_OK) {
+		sr_err("Received invalid data block length '%s'.", buf + 2);
 		return -1;
 	}
 
-	sr_dbg("Received data block header: %s%s -> block length %d", start, length, len);
+	sr_dbg("Received data block header: '%s' -> block length %d", buf, ret);
 
-	return len;
+	return ret;
 }
 
 SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
@@ -458,7 +483,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 	struct sr_datafeed_logic logic;
 	double vdiv, offset;
 	int len, i, vref;
-	struct sr_probe *probe;
+	struct sr_channel *probe;
 	gsize expected_data_bytes;
 
 	(void)fd;
@@ -480,7 +505,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 				return TRUE;
 			if (rigol_ds_channel_start(sdi) != SR_OK)
 				return TRUE;
-			break;
+			return TRUE;
 		case WAIT_BLOCK:
 			if (rigol_ds_block_wait(sdi) != SR_OK)
 				return TRUE;
@@ -512,9 +537,17 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 
 			if (devc->format == FORMAT_IEEE488_2) {
 				sr_dbg("New block header expected");
-				len = rigol_ds_read_header(scpi);
-				if (len == -1)
+				len = rigol_ds_read_header(sdi);
+				if (len == 0)
+					/* Still reading the header. */
+					return TRUE;
+				if (len == -1) {
+					sr_err("Read error, aborting capture.");
+					packet.type = SR_DF_FRAME_END;
+					sr_session_send(cb_data, &packet);
+					sdi->driver->dev_acquisition_stop(sdi, cb_data);
 					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.
@@ -535,12 +568,21 @@ 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);
 
-		sr_dbg("Received %d bytes.", len);
-		if (len == -1)
+		len = sr_scpi_read_data(scpi, (char *)devc->buffer, len);
+
+		if (len == -1) {
+			sr_err("Read error, aborting capture.");
+			packet.type = SR_DF_FRAME_END;
+			sr_session_send(cb_data, &packet);
+			sdi->driver->dev_acquisition_stop(sdi, cb_data);
 			return TRUE;
+		}
+
+		sr_dbg("Received %d bytes.", len);
 
 		devc->num_block_read += len;
 
@@ -575,16 +617,21 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 
 		if (devc->num_block_read == devc->num_block_bytes) {
 			sr_dbg("Block has been completed");
-			if (devc->format == FORMAT_IEEE488_2) {
+			if (devc->model->series->protocol >= PROTOCOL_V3) {
 				/* Discard the terminating linefeed */
 				sr_scpi_read_data(scpi, (char *)devc->buffer, 1);
+			}
+			if (devc->format == FORMAT_IEEE488_2) {
 				/* Prepare for possible next block */
+				devc->num_header_bytes = 0;
 				devc->num_block_bytes = 0;
 				if (devc->data_source != DATA_SOURCE_LIVE)
 					rigol_ds_set_wait_event(devc, WAIT_BLOCK);
 			}
 			if (!sr_scpi_read_complete(scpi)) {
 				sr_err("Read should have been completed");
+				packet.type = SR_DF_FRAME_END;
+				sr_session_send(cb_data, &packet);
 				sdi->driver->dev_acquisition_stop(sdi, cb_data);
 				return TRUE;
 			}