X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Frigol-ds%2Fprotocol.c;h=8c66d63e8905aac57f493ceeb4f96d42b16bb005;hb=2b399703d10dedfbed1f6b13070e0c3f5fd9938b;hp=5ede6d7cab562e081226d65b622bca38a54c2f40;hpb=bfaf112b689cba3ae5b3a73133fcdf7e45653550;p=libsigrok.git

diff --git a/hardware/rigol-ds/protocol.c b/hardware/rigol-ds/protocol.c
index 5ede6d7c..8c66d63e 100644
--- a/hardware/rigol-ds/protocol.c
+++ b/hardware/rigol-ds/protocol.c
@@ -64,9 +64,6 @@
  * Each data block has a trailing linefeed too.
  */
 
-static int get_cfg(const struct sr_dev_inst *sdi, char *cmd, char *reply, size_t maxlen);
-static int get_cfg_int(const struct sr_dev_inst *sdi, char *cmd, int *i);
-
 static int parse_int(const char *str, int *ret)
 {
 	char *e;
@@ -107,7 +104,7 @@ static void rigol_ds_set_wait_event(struct dev_context *devc, enum wait_events e
  */
 static int rigol_ds_event_wait(const struct sr_dev_inst *sdi, char status1, char status2)
 {
-	char buf[20];
+	char *buf;
 	struct dev_context *devc;
 	time_t start;
 
@@ -132,7 +129,7 @@ static int rigol_ds_event_wait(const struct sr_dev_inst *sdi, char status1, char
 				return SR_ERR_TIMEOUT;
 			}
 
-			if (get_cfg(sdi, ":TRIG:STAT?", buf, sizeof(buf)) != SR_OK)
+			if (sr_scpi_get_string(sdi->conn, ":TRIG:STAT?", &buf) != SR_OK)
 				return SR_ERR;
 		} while (buf[0] == status1 || buf[0] == status2);
 
@@ -145,7 +142,7 @@ static int rigol_ds_event_wait(const struct sr_dev_inst *sdi, char status1, char
 				return SR_ERR_TIMEOUT;
 			}
 
-			if (get_cfg(sdi, ":TRIG:STAT?", buf, sizeof(buf)) != SR_OK)
+			if (sr_scpi_get_string(sdi->conn, ":TRIG:STAT?", &buf) != SR_OK)
 				return SR_ERR;
 		} while (buf[0] != status1 && buf[0] != status2);
 
@@ -182,14 +179,13 @@ static int rigol_ds_trigger_wait(const struct sr_dev_inst *sdi)
 	 * 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.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
+			s = (devc->timebase * devc->model->series->num_horizontal_divs
 			     * 85e6) / 100L;
 			sr_spew("Sleeping for %ld usecs instead of trigger-wait", s);
 			g_usleep(s);
@@ -219,13 +215,16 @@ static int rigol_ds_check_stop(const struct sr_dev_inst *sdi)
 
 	probe = devc->channel_entry->data;
 
-	if (sr_scpi_send(sdi->conn, ":WAV:SOUR CHAN%d",
+	if (devc->model->series->protocol <= PROTOCOL_V2)
+		return SR_OK;
+
+	if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d",
 			  probe->index + 1) != SR_OK)
 		return SR_ERR;
 	/* Check that the number of samples will be accepted */
-	if (sr_scpi_send(sdi->conn, ":WAV:POIN %d;*OPC", devc->analog_frame_size) != SR_OK)
+	if (rigol_ds_config_set(sdi, ":WAV:POIN %d", devc->analog_frame_size) != SR_OK)
 		return SR_ERR;
-	if (get_cfg_int(sdi, "*ESR?", &tmp) != SR_OK)
+	if (sr_scpi_get_int(sdi->conn, "*ESR?", &tmp) != SR_OK)
 		return SR_ERR;
 	/*
 	 * If we get an "Execution error" the scope went from "Single" to
@@ -243,7 +242,7 @@ static int rigol_ds_check_stop(const struct sr_dev_inst *sdi)
 		sr_warn("Single shot acquisition failed, retrying...");
 		/* Sleep a bit, otherwise the single shot will often fail */
 		g_usleep(500000);
-		sr_scpi_send(sdi->conn, ":SING");
+		rigol_ds_config_set(sdi, ":SING");
 		rigol_ds_set_wait_event(devc, WAIT_STOP);
 		return SR_ERR;
 	}
@@ -254,7 +253,7 @@ static int rigol_ds_check_stop(const struct sr_dev_inst *sdi)
 /* 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];
+	char *buf;
 	struct dev_context *devc;
 	time_t start;
 	int len;
@@ -279,7 +278,7 @@ static int rigol_ds_block_wait(const struct sr_dev_inst *sdi)
 		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)
+		if (sr_scpi_get_string(sdi->conn, ":WAV:STAT?", &buf) != SR_OK)
 			return SR_ERR;
 
 		if (parse_int(buf + 5, &len) != SR_OK)
@@ -291,10 +290,35 @@ static int rigol_ds_block_wait(const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
+/* Send a configuration setting. */
+SR_PRIV int rigol_ds_config_set(const struct sr_dev_inst *sdi, const char *format, ...)
+{
+	struct dev_context *devc = sdi->priv;
+	va_list args;
+	int ret;
+
+	va_start(args, format);
+	ret = sr_scpi_send_variadic(sdi->conn, format, args);
+	va_end(args);
+
+	if (ret != SR_OK)
+		return SR_ERR;
+
+	if (devc->model->series->protocol == PROTOCOL_V2) {
+		/* The DS1000 series needs this stupid delay, *OPC? doesn't work. */
+		sr_spew("delay %dms", 100);
+		g_usleep(100000);
+		return SR_OK;
+	} else {
+		return sr_scpi_get_opc(sdi->conn);
+	}
+}
+
 /* Start capturing a new frameset */
 SR_PRIV int rigol_ds_capture_start(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
+	gchar *trig_mode;
 
 	if (!(devc = sdi->priv))
 		return SR_ERR;
@@ -302,18 +326,44 @@ SR_PRIV int rigol_ds_capture_start(const struct sr_dev_inst *sdi)
 	sr_dbg("Starting data capture for frameset %lu of %lu",
 	       devc->num_frames + 1, devc->limit_frames);
 
-	if (sr_scpi_send(sdi->conn, ":WAV:FORM BYTE") != SR_OK)
-		return SR_ERR;
-	if (devc->data_source == DATA_SOURCE_LIVE) {
-		if (sr_scpi_send(sdi->conn, ":WAV:MODE NORM") != SR_OK)
-			return SR_ERR;
+	switch (devc->model->series->protocol) {
+	case PROTOCOL_V1:
 		rigol_ds_set_wait_event(devc, WAIT_TRIGGER);
-	} else {
-		if (sr_scpi_send(sdi->conn, ":WAV:MODE RAW") != SR_OK)
+		break;
+	case PROTOCOL_V2:
+		if (devc->data_source == DATA_SOURCE_LIVE) {
+			if (rigol_ds_config_set(sdi, ":WAV:POIN:MODE NORMAL") != SR_OK)
+				return SR_ERR;
+			rigol_ds_set_wait_event(devc, WAIT_TRIGGER);
+		} else {
+			if (rigol_ds_config_set(sdi, ":STOP") != SR_OK)
+				return SR_ERR;
+			if (rigol_ds_config_set(sdi, ":WAV:POIN:MODE RAW") != SR_OK)
+				return SR_ERR;
+			if (sr_scpi_get_string(sdi->conn, ":TRIG:MODE?", &trig_mode) != SR_OK)
+				return SR_ERR;
+			if (rigol_ds_config_set(sdi, ":TRIG:%s:SWE SING", trig_mode) != SR_OK)
+				return SR_ERR;
+			if (rigol_ds_config_set(sdi, ":RUN") != SR_OK)
+				return SR_ERR;
+			rigol_ds_set_wait_event(devc, WAIT_STOP);
+		}
+		break;
+	case PROTOCOL_V3:
+		if (rigol_ds_config_set(sdi, ":WAV:FORM BYTE") != SR_OK)
 			return SR_ERR;
-		if (sr_scpi_send(sdi->conn, ":SING", devc->analog_frame_size) != SR_OK)
-			return SR_ERR;		
-		rigol_ds_set_wait_event(devc, WAIT_STOP);
+		if (devc->data_source == DATA_SOURCE_LIVE) {
+			if (rigol_ds_config_set(sdi, ":WAV:MODE NORM") != SR_OK)
+				return SR_ERR;
+			rigol_ds_set_wait_event(devc, WAIT_TRIGGER);
+		} else {
+			if (rigol_ds_config_set(sdi, ":WAV:MODE RAW") != SR_OK)
+				return SR_ERR;
+			if (rigol_ds_config_set(sdi, ":SING") != SR_OK)
+				return SR_ERR;
+			rigol_ds_set_wait_event(devc, WAIT_STOP);
+		}
+		break;
 	}
 
 	return SR_OK;
@@ -332,7 +382,7 @@ SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi)
 
 	sr_dbg("Starting reading data from channel %d", probe->index + 1);
 
-	if (devc->model->protocol == PROTOCOL_LEGACY) {
+	if (devc->model->series->protocol <= PROTOCOL_V2) {
 		if (probe->type == SR_PROBE_LOGIC) {
 			if (sr_scpi_send(sdi->conn, ":WAV:DATA? DIG") != SR_OK)
 				return SR_ERR;
@@ -341,21 +391,22 @@ SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi)
 					probe->index + 1) != SR_OK)
 				return SR_ERR;
 		}
+		rigol_ds_set_wait_event(devc, WAIT_NONE);
 	} else {
-		if (sr_scpi_send(sdi->conn, ":WAV:SOUR CHAN%d",
+		if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d",
 				  probe->index + 1) != SR_OK)
 			return SR_ERR;
 		if (devc->data_source != DATA_SOURCE_LIVE) {
-			if (sr_scpi_send(sdi->conn, ":WAV:RES") != SR_OK)
+			if (rigol_ds_config_set(sdi, ":WAV:RES") != SR_OK)
 				return SR_ERR;
-			if (sr_scpi_send(sdi->conn, ":WAV:BEG") != SR_OK)
+			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);
 	}
 
-	devc->num_frame_samples = 0;
+	devc->num_channel_bytes = 0;
 	devc->num_block_bytes = 0;
 
 	return SR_OK;
@@ -370,13 +421,11 @@ static int rigol_ds_read_header(struct sr_scpi_dev_inst *scpi)
 	/* Read the hashsign and length digit. */
 	tmp = sr_scpi_read_data(scpi, start, 2);
 	start[2] = '\0';
-	if (tmp != 2)
-	{
+	if (tmp != 2) {
 		sr_err("Failed to read first two bytes of data block header.");
 		return -1;
 	}
-	if (start[0] != '#' || !isdigit(start[1]) || start[1] == '0')
-	{
+	if (start[0] != '#' || !isdigit(start[1]) || start[1] == '0') {
 		sr_err("Received invalid data block header start '%s'.", start);
 		return -1;
 	}
@@ -385,13 +434,11 @@ static int rigol_ds_read_header(struct sr_scpi_dev_inst *scpi)
 	/* Read the data length. */
 	tmp = sr_scpi_read_data(scpi, length, len);
 	length[len] = '\0';
-	if (tmp != len)
-	{
+	if (tmp != len) {
 		sr_err("Failed to read %d bytes of data block length.", len);
 		return -1;
 	}
-	if (parse_int(length, &len) != SR_OK)
-	{
+	if (parse_int(length, &len) != SR_OK) {
 		sr_err("Received invalid data block length '%s'.", length);
 		return -1;
 	}
@@ -412,6 +459,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 	double vdiv, offset;
 	int len, i, vref;
 	struct sr_probe *probe;
+	gsize expected_data_bytes;
 
 	(void)fd;
 
@@ -424,49 +472,45 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 	scpi = sdi->conn;
 
 	if (revents == G_IO_IN || revents == 0) {
-		if (devc->model->protocol == PROTOCOL_IEEE488_2) {
-			switch(devc->wait_event) {
-			case WAIT_NONE:
-				break;
-
-			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;
+		switch(devc->wait_event) {
+		case WAIT_NONE:
+			break;
+		case WAIT_TRIGGER:
+			if (rigol_ds_trigger_wait(sdi) != SR_OK)
 				return TRUE;
-
-			default:
-				sr_err("BUG: Unknown event target encountered");
-			}
+			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");
 		}
 
 		probe = devc->channel_entry->data;
-		
-		if (devc->num_block_bytes == 0 &&
-		    devc->model->protocol == PROTOCOL_IEEE488_2) {
+
+		expected_data_bytes = probe->type == SR_PROBE_ANALOG ?
+				devc->analog_frame_size : devc->digital_frame_size;
+
+		if (devc->num_block_bytes == 0) {
+			if (devc->model->series->protocol >= PROTOCOL_V3)
 				if (sr_scpi_send(sdi->conn, ":WAV:DATA?") != SR_OK)
 					return TRUE;
-		}
 
-		if (devc->num_block_bytes == 0) {
 			if (sr_scpi_read_begin(scpi) != SR_OK)
 				return TRUE;
-			if (devc->model->protocol == PROTOCOL_IEEE488_2) {
+
+			if (devc->format == FORMAT_IEEE488_2) {
 				sr_dbg("New block header expected");
 				len = rigol_ds_read_header(scpi);
 				if (len == -1)
@@ -478,18 +522,14 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 				 * appear eventually.
 				 */
 				if (devc->data_source == DATA_SOURCE_LIVE
-						&& (unsigned)len < devc->num_frame_samples) {
+						&& (unsigned)len < expected_data_bytes) {
 					sr_dbg("Discarding short data block");
 					sr_scpi_read_data(scpi, (char *)devc->buffer, len + 1);
 					return TRUE;
 				}
 				devc->num_block_bytes = len;
 			} else {
-				devc->num_block_bytes = probe->type == SR_PROBE_ANALOG ?
-					(devc->model->series == RIGOL_VS5000 ?
-						VS5000_ANALOG_LIVE_WAVEFORM_SIZE :
-						DS1000_ANALOG_LIVE_WAVEFORM_SIZE) :
-					DIGITAL_WAVEFORM_SIZE;
+				devc->num_block_bytes = expected_data_bytes;
 			}
 			devc->num_block_read = 0;
 		}
@@ -504,17 +544,11 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 
 		devc->num_block_read += len;
 
-		if (devc->num_frame_samples == 0) {
-			/* Start of a new frame. */
-			packet.type = SR_DF_FRAME_BEGIN;
-			sr_session_send(sdi, &packet);
-		}
-
 		if (probe->type == SR_PROBE_ANALOG) {
 			vref = devc->vert_reference[probe->index];
 			vdiv = devc->vdiv[probe->index] / 25.6;
 			offset = devc->vert_offset[probe->index];
-			if (devc->model->protocol == PROTOCOL_IEEE488_2)
+			if (devc->model->series->protocol >= PROTOCOL_V3)
 				for (i = 0; i < len; i++)
 					devc->data[i] = ((int)devc->buffer[i] - vref) * vdiv - offset;
 			else
@@ -531,9 +565,9 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 			sr_session_send(cb_data, &packet);
 			g_slist_free(analog.probes);
 		} else {
-			logic.length = len - 10;
+			logic.length = len;
 			logic.unitsize = 2;
-			logic.data = devc->buffer + 10;
+			logic.data = devc->buffer;
 			packet.type = SR_DF_LOGIC;
 			packet.payload = &logic;
 			sr_session_send(cb_data, &packet);
@@ -541,31 +575,34 @@ 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->model->protocol == PROTOCOL_IEEE488_2) {
-				/* Discard the terminating linefeed and prepare for
-				   possible next block */
+			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_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");
+				sdi->driver->dev_acquisition_stop(sdi, cb_data);
+				return TRUE;
+			}
 			devc->num_block_read = 0;
 		} else {
 			sr_dbg("%d of %d block bytes read", devc->num_block_read, devc->num_block_bytes);
 		}
 
-		devc->num_frame_samples += len;
+		devc->num_channel_bytes += len;
 
-		if (devc->num_frame_samples < (probe->type == SR_PROBE_ANALOG ?
-					devc->analog_frame_size : DIGITAL_WAVEFORM_SIZE))
-			/* Don't have the whole frame yet. */
+		if (devc->num_channel_bytes < expected_data_bytes)
+			/* Don't have the full data for this channel yet, re-run. */
 			return TRUE;
 
-		/* End of the frame. */
-		sr_dbg("Frame completed, %d samples", devc->num_frame_samples);
-		packet.type = SR_DF_FRAME_END;
-		sr_session_send(sdi, &packet);
-		if (devc->model->protocol == PROTOCOL_IEEE488_2) {
+		/* End of data for this channel. */
+		if (devc->model->series->protocol >= PROTOCOL_V3) {
 			/* Signal end of data download to scope */
 			if (devc->data_source != DATA_SOURCE_LIVE)
 				/*
@@ -573,7 +610,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 				 * to the next channel causes an error. Fun with
 				 * firmware...
 				 */
-				sr_scpi_send(sdi->conn, ":WAV:END");
+				rigol_ds_config_set(sdi, ":WAV:END");
 		}
 
 		if (probe->type == SR_PROBE_ANALOG
@@ -589,22 +626,27 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 				/* Now we need to get the digital data. */
 				devc->channel_entry = devc->enabled_digital_probes;
 				rigol_ds_channel_start(sdi);
-			} else if (++devc->num_frames == devc->limit_frames) {
-				/* End of last frame. */
-				packet.type = SR_DF_END;
-				sr_session_send(sdi, &packet);
-				sdi->driver->dev_acquisition_stop(sdi, cb_data);
 			} else {
-				/* Get the next frame, starting with the first analog channel. */
-				if (devc->enabled_analog_probes)
-					devc->channel_entry = devc->enabled_analog_probes;
-				else
-					devc->channel_entry = devc->enabled_digital_probes;
-
-				if (devc->model->protocol == PROTOCOL_LEGACY)
-					rigol_ds_channel_start(sdi);
-				else
+				/* Done with this frame. */
+				packet.type = SR_DF_FRAME_END;
+				sr_session_send(cb_data, &packet);
+
+				if (++devc->num_frames == devc->limit_frames) {
+					/* Last frame, stop capture. */
+					sdi->driver->dev_acquisition_stop(sdi, cb_data);
+				} else {
+					/* Get the next frame, starting with the first analog channel. */
+					if (devc->enabled_analog_probes)
+						devc->channel_entry = devc->enabled_analog_probes;
+					else
+						devc->channel_entry = devc->enabled_digital_probes;
+
 					rigol_ds_capture_start(sdi);
+
+					/* Start of next frame. */
+					packet.type = SR_DF_FRAME_BEGIN;
+					sr_session_send(cb_data, &packet);
+				}
 			}
 		}
 	}
@@ -612,70 +654,6 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 	return TRUE;
 }
 
-static int get_cfg(const struct sr_dev_inst *sdi, char *cmd, char *reply, size_t maxlen)
-{
-	int len;
-	struct dev_context *devc = sdi->priv;
-	struct sr_scpi_dev_inst *scpi = sdi->conn;
-	char *response;
-
-	if (sr_scpi_get_string(scpi, cmd, &response) != SR_OK)
-		return SR_ERR;
-
-	g_strlcpy(reply, response, maxlen);
-	g_free(response);
-	len = strlen(reply);
-
-	if (devc->model->protocol == PROTOCOL_IEEE488_2) {
-		/* get rid of trailing linefeed */
-		if (len >= 1 && reply[len-1] == '\n')
-			reply[len-1] = '\0';
-	}
-
-	sr_spew("Received '%s'.", reply);
-
-	return SR_OK;
-}
-
-static int get_cfg_int(const struct sr_dev_inst *sdi, char *cmd, int *i)
-{
-	char buf[32];
-
-	if (get_cfg(sdi, cmd, buf, sizeof(buf)) != SR_OK)
-		return SR_ERR;
-
-	if (parse_int(buf, i) != SR_OK)
-		return SR_ERR;
-
-	return SR_OK;
-}
-
-static int get_cfg_float(const struct sr_dev_inst *sdi, char *cmd, float *f)
-{
-	char buf[32], *e;
-
-	if (get_cfg(sdi, cmd, buf, sizeof(buf)) != SR_OK)
-		return SR_ERR;
-	*f = strtof(buf, &e);
-	if (e == buf || (fpclassify(*f) & (FP_ZERO | FP_NORMAL)) == 0) {
-		sr_dbg("failed to parse response to '%s': '%s'", cmd, buf);
-		return SR_ERR;
-	}
-
-	return SR_OK;
-}
-
-static int get_cfg_string(const struct sr_dev_inst *sdi, char *cmd, char **buf)
-{
-	if (!(*buf = g_try_malloc0(256)))
-		return SR_ERR_MALLOC;
-
-	if (get_cfg(sdi, cmd, *buf, 256) != SR_OK)
-		return SR_ERR;
-
-	return SR_OK;
-}
-
 SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
@@ -688,7 +666,7 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
 	/* Analog channel state. */
 	for (i = 0; i < devc->model->analog_channels; i++) {
 		cmd = g_strdup_printf(":CHAN%d:DISP?", i + 1);
-		res = get_cfg_string(sdi, cmd, &t_s);
+		res = sr_scpi_get_string(sdi->conn, cmd, &t_s);
 		g_free(cmd);
 		if (res != SR_OK)
 			return SR_ERR;
@@ -700,10 +678,14 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
 
 	/* Digital channel state. */
 	if (devc->model->has_digital) {
-		sr_dbg("Current digital channel state:");
+		if (sr_scpi_get_string(sdi->conn, ":LA:DISP?", &t_s) != SR_OK)
+			return SR_ERR;
+		devc->la_enabled = !strcmp(t_s, "ON") ? TRUE : FALSE;
+		sr_dbg("Logic analyzer %s, current digital channel state:",
+				devc->la_enabled ? "enabled" : "disabled");
 		for (i = 0; i < 16; i++) {
 			cmd = g_strdup_printf(":DIG%d:TURN?", i);
-			res = get_cfg_string(sdi, cmd, &t_s);
+			res = sr_scpi_get_string(sdi->conn, cmd, &t_s);
 			g_free(cmd);
 			if (res != SR_OK)
 				return SR_ERR;
@@ -714,14 +696,14 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
 	}
 
 	/* Timebase. */
-	if (get_cfg_float(sdi, ":TIM:SCAL?", &devc->timebase) != SR_OK)
+	if (sr_scpi_get_float(sdi->conn, ":TIM:SCAL?", &devc->timebase) != SR_OK)
 		return SR_ERR;
 	sr_dbg("Current timebase %g", devc->timebase);
 
 	/* Vertical gain. */
 	for (i = 0; i < devc->model->analog_channels; i++) {
 		cmd = g_strdup_printf(":CHAN%d:SCAL?", i + 1);
-		res = get_cfg_float(sdi, cmd, &devc->vdiv[i]);
+		res = sr_scpi_get_float(sdi->conn, cmd, &devc->vdiv[i]);
 		g_free(cmd);
 		if (res != SR_OK)
 			return SR_ERR;
@@ -731,12 +713,12 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
 		sr_dbg("CH%d %g", i + 1, devc->vdiv[i]);
 
 	sr_dbg("Current vertical reference:");
-	if (devc->model->protocol == PROTOCOL_IEEE488_2) {
+	if (devc->model->series->protocol >= PROTOCOL_V3) {
 		/* Vertical reference - not certain if this is the place to read it. */
 		for (i = 0; i < devc->model->analog_channels; i++) {
-			if (sr_scpi_send(sdi->conn, ":WAV:SOUR CHAN%d", i + 1) != SR_OK)
+			if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d", i + 1) != SR_OK)
 				return SR_ERR;
-			if (get_cfg_int(sdi, ":WAV:YREF?", &devc->vert_reference[i]) != SR_OK)
+			if (sr_scpi_get_int(sdi->conn, ":WAV:YREF?", &devc->vert_reference[i]) != SR_OK)
 				return SR_ERR;
 			sr_dbg("CH%d %d", i + 1, devc->vert_reference[i]);
 		}
@@ -745,7 +727,7 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
 	/* Vertical offset. */
 	for (i = 0; i < devc->model->analog_channels; i++) {
 		cmd = g_strdup_printf(":CHAN%d:OFFS?", i + 1);
-		res = get_cfg_float(sdi, cmd, &devc->vert_offset[i]);
+		res = sr_scpi_get_float(sdi->conn, cmd, &devc->vert_offset[i]);
 		g_free(cmd);
 		if (res != SR_OK)
 			return SR_ERR;
@@ -757,7 +739,7 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
 	/* Coupling. */
 	for (i = 0; i < devc->model->analog_channels; i++) {
 		cmd = g_strdup_printf(":CHAN%d:COUP?", i + 1);
-		res = get_cfg_string(sdi, cmd, &devc->coupling[i]);
+		res = sr_scpi_get_string(sdi->conn, cmd, &devc->coupling[i]);
 		g_free(cmd);
 		if (res != SR_OK)
 			return SR_ERR;
@@ -767,17 +749,17 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
 		sr_dbg("CH%d %s", i + 1, devc->coupling[i]);
 
 	/* Trigger source. */
-	if (get_cfg_string(sdi, ":TRIG:EDGE:SOUR?", &devc->trigger_source) != SR_OK)
+	if (sr_scpi_get_string(sdi->conn, ":TRIG:EDGE:SOUR?", &devc->trigger_source) != SR_OK)
 		return SR_ERR;
 	sr_dbg("Current trigger source %s", devc->trigger_source);
 
 	/* Horizontal trigger position. */
-	if (get_cfg_float(sdi, ":TIM:OFFS?", &devc->horiz_triggerpos) != SR_OK)
+	if (sr_scpi_get_float(sdi->conn, ":TIM:OFFS?", &devc->horiz_triggerpos) != SR_OK)
 		return SR_ERR;
 	sr_dbg("Current horizontal trigger position %g", devc->horiz_triggerpos);
 
 	/* Trigger slope. */
-	if (get_cfg_string(sdi, ":TRIG:EDGE:SLOP?", &devc->trigger_slope) != SR_OK)
+	if (sr_scpi_get_string(sdi->conn, ":TRIG:EDGE:SLOP?", &devc->trigger_slope) != SR_OK)
 		return SR_ERR;
 	sr_dbg("Current trigger slope %s", devc->trigger_slope);