X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprotocol.c;h=b6b57fb8d8792a5c728738bcedda113d2523bd7a;hb=c01bf34ca264b268fee2e71ab918c71d28dc3018;hp=4f2586db97bb69152972f4c6c476b856beb7626d;hpb=01b0257aefc10874012e9bc066802a2c3a308801;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/protocol.c b/src/hardware/scpi-pps/protocol.c
index 4f2586db..b6b57fb8 100644
--- a/src/hardware/scpi-pps/protocol.c
+++ b/src/hardware/scpi-pps/protocol.c
@@ -17,85 +17,39 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <string.h>
+#include <strings.h>
 #include <stdarg.h>
+#include "scpi.h"
 #include "protocol.h"
 
-SR_PRIV char *scpi_cmd_get(const struct sr_dev_inst *sdi, int command)
+SR_PRIV int select_channel(const struct sr_dev_inst *sdi, struct sr_channel *ch)
 {
 	struct dev_context *devc;
-	unsigned int i;
-	char *cmd;
-
-	devc = sdi->priv;
-	cmd = NULL;
-	for (i = 0; i < devc->device->num_commands; i++) {
-		if (devc->device->commands[i].command == command) {
-			cmd = devc->device->commands[i].string;
-			break;
-		}
-	}
-
-	return cmd;
-}
-
-SR_PRIV int scpi_cmd(const struct sr_dev_inst *sdi, int command, ...)
-{
-	struct sr_scpi_dev_inst *scpi;
-	va_list args;
+	struct pps_channel *cur_pch, *new_pch;
 	int ret;
-	char *cmd;
-
-	if (!(cmd = scpi_cmd_get(sdi, command))) {
-		/* Device does not implement this command, that's OK. */
-		return SR_OK_CONTINUE;
-	}
 
-	scpi = sdi->conn;
-	va_start(args, command);
-	ret = sr_scpi_send_variadic(scpi, cmd, args);
-	va_end(args);
+	if (g_slist_length(sdi->channels) == 1)
+		return SR_OK;
 
-	return ret;
-}
-
-SR_PRIV int scpi_cmd_resp(const struct sr_dev_inst *sdi, GVariant **gvar,
-		const GVariantType *gvtype, int command, ...)
-{
-	struct sr_scpi_dev_inst *scpi;
-	va_list args;
-	double d;
-	int ret;
-	char *cmd, *s;
-
-	if (!(cmd = scpi_cmd_get(sdi, command))) {
-		/* Device does not implement this command, that's OK. */
-		return SR_OK_CONTINUE;
+	devc = sdi->priv;
+	if (ch == devc->cur_channel)
+		return SR_OK;
+
+	new_pch = ch->priv;
+	if (devc->cur_channel) {
+		cur_pch = devc->cur_channel->priv;
+		if (cur_pch->hw_output_idx == new_pch->hw_output_idx) {
+			/* Same underlying output channel. */
+			devc->cur_channel = ch;
+			return SR_OK;
+		}
 	}
 
-	scpi = sdi->conn;
-	va_start(args, command);
-	ret = sr_scpi_send_variadic(scpi, cmd, args);
-	va_end(args);
-	if (ret != SR_OK)
-		return ret;
-
-	if (g_variant_type_equal(gvtype, G_VARIANT_TYPE_BOOLEAN)) {
-		if ((ret = sr_scpi_get_string(scpi, NULL, &s)) != SR_OK)
-			return ret;
-		if (!strcasecmp(s, "ON") || !strcasecmp(s, "1") || !strcasecmp(s, "YES"))
-			*gvar = g_variant_new_boolean(TRUE);
-		else if (!strcasecmp(s, "OFF") || !strcasecmp(s, "0") || !strcasecmp(s, "NO"))
-			*gvar = g_variant_new_boolean(FALSE);
-		else
-			ret = SR_ERR;
-	} if (g_variant_type_equal(gvtype, G_VARIANT_TYPE_DOUBLE)) {
-		if ((ret = sr_scpi_get_double(scpi, NULL, &d)) == SR_OK)
-			*gvar = g_variant_new_double(d);
-	} if (g_variant_type_equal(gvtype, G_VARIANT_TYPE_STRING)) {
-		if ((ret = sr_scpi_get_string(scpi, NULL, &s)) == SR_OK)
-			*gvar = g_variant_new_string(s);
-	}
+	if ((ret = scpi_cmd(sdi, devc->device->commands, SCPI_CMD_SELECT_CHANNEL,
+			new_pch->hwname)) >= 0)
+		devc->cur_channel = ch;
 
 	return ret;
 }
@@ -104,11 +58,11 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
 {
 	struct dev_context *devc;
 	struct sr_datafeed_packet packet;
-	struct sr_datafeed_analog analog;
+	struct sr_datafeed_analog_old analog;
 	const struct sr_dev_inst *sdi;
+	struct sr_channel *next_channel;
 	struct sr_scpi_dev_inst *scpi;
 	struct pps_channel *pch;
-	GSList *l;
 	float f;
 	int cmd;
 
@@ -126,7 +80,7 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
 	/* Retrieve requested value for this state. */
 	if (sr_scpi_get_float(scpi, NULL, &f) == SR_OK) {
 		pch = devc->cur_channel->priv;
-		packet.type = SR_DF_ANALOG;
+		packet.type = SR_DF_ANALOG_OLD;
 		packet.payload = &analog;
 		analog.channels = g_slist_append(NULL, devc->cur_channel);
 		analog.num_samples = 1;
@@ -143,25 +97,26 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
 		g_slist_free(analog.channels);
 	}
 
-	/* Find next enabled channel. */
-	do {
-		l = g_slist_find(sdi->channels, devc->cur_channel);
-		if (l->next)
-			devc->cur_channel = l->next->data;
-		else
-			devc->cur_channel = sdi->channels->data;
-	} while (!devc->cur_channel->enabled);
+	if (g_slist_length(sdi->channels) > 1) {
+		next_channel = sr_next_enabled_channel(sdi, devc->cur_channel);
+		if (select_channel(sdi, next_channel) != SR_OK) {
+			sr_err("Failed to select channel %s", next_channel->name);
+			return FALSE;
+		}
+	}
 
 	pch = devc->cur_channel->priv;
 	if (pch->mq == SR_MQ_VOLTAGE)
 		cmd = SCPI_CMD_GET_MEAS_VOLTAGE;
+	else if (pch->mq == SR_MQ_FREQUENCY)
+		cmd = SCPI_CMD_GET_MEAS_FREQUENCY;
 	else if (pch->mq == SR_MQ_CURRENT)
 		cmd = SCPI_CMD_GET_MEAS_CURRENT;
 	else if (pch->mq == SR_MQ_POWER)
 		cmd = SCPI_CMD_GET_MEAS_POWER;
 	else
 		return SR_ERR;
-	scpi_cmd(sdi, cmd, pch->hwname);
+	scpi_cmd(sdi, devc->device->commands, cmd);
 
 	return TRUE;
 }