portability: Use g_ascii_strcasecmp() in favor of strcasecmp().

[libsigrok.git] / src / hardware / scpi-pps / protocol.c

diff --git a/src/hardware/scpi-pps/protocol.c b/src/hardware/scpi-pps/protocol.c
index 667ce46ae29242d7546fa8e831cd3d1a9f2a44d7..fcf3f21b6cbf1ae5ca5837b6105de3633f5a5094 100644 (file)
--- a/src/hardware/scpi-pps/protocol.c
+++ b/src/hardware/scpi-pps/protocol.c
@@ -18,92 +18,15 @@
  */
 
 #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)
-{
-       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;
-       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);
-
-       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;
-       }
-
-       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);
-       }
-
-       return ret;
-}
-
 SR_PRIV int select_channel(const struct sr_dev_inst *sdi, struct sr_channel *ch)
 {
        struct dev_context *devc;
-       struct pps_channel *pch;
+       struct pps_channel *cur_pch, *new_pch;
        int ret;
 
        if (g_slist_length(sdi->channels) == 1)
@@ -113,8 +36,18 @@ SR_PRIV int select_channel(const struct sr_dev_inst *sdi, struct sr_channel *ch)
        if (ch == devc->cur_channel)
                return SR_OK;
 
-       pch = ch->priv;
-       if ((ret = scpi_cmd(sdi, SCPI_CMD_SELECT_CHANNEL, pch->hwname)) == 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;
+               }
+       }
+
+       if ((ret = scpi_cmd(sdi, devc->device->commands, SCPI_CMD_SELECT_CHANNEL,
+                       new_pch->hwname)) >= 0)
                devc->cur_channel = ch;
 
        return ret;
@@ -129,7 +62,6 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
        struct sr_channel *next_channel;
        struct sr_scpi_dev_inst *scpi;
        struct pps_channel *pch;
-       GSList *l;
        float f;
        int cmd;
 
@@ -165,17 +97,8 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
        }
 
        if (g_slist_length(sdi->channels) > 1) {
-               /* Find next enabled channel. */
-               next_channel = devc->cur_channel;
-               do {
-                       l = g_slist_find(sdi->channels, next_channel);
-                       if (l->next)
-                               next_channel = l->next->data;
-                       else
-                               next_channel = sdi->channels->data;
-               } while (!next_channel->enabled);
-               select_channel(sdi, next_channel);
-               if (devc->cur_channel != next_channel) {
+               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;
                }
@@ -184,13 +107,15 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
        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;
 }