Constify a few arrays and variables.

[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 13133b5b8c5808ad459d9d7b653dc79369b2e35a..be4788600ef7ab72aedb216edba440810961bca1 100644 (file)
--- a/src/hardware/scpi-pps/protocol.c
+++ b/src/hardware/scpi-pps/protocol.c
@@ -21,11 +21,11 @@
 #include <stdarg.h>
 #include "protocol.h"
 
-SR_PRIV char *scpi_cmd_get(const struct sr_dev_inst *sdi, int command)
+SR_PRIV const char *scpi_cmd_get(const struct sr_dev_inst *sdi, int command)
 {
        struct dev_context *devc;
        unsigned int i;
-       char *cmd;
+       const char *cmd;
 
        devc = sdi->priv;
        cmd = NULL;
@@ -44,7 +44,7 @@ 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;
+       const char *cmd;
 
        if (!(cmd = scpi_cmd_get(sdi, command))) {
                /* Device does not implement this command, that's OK. */
@@ -66,7 +66,8 @@ SR_PRIV int scpi_cmd_resp(const struct sr_dev_inst *sdi, GVariant **gvar,
        va_list args;
        double d;
        int ret;
-       char *cmd, *s;
+       char *s;
+       const char *cmd;
 
        if (!(cmd = scpi_cmd_get(sdi, command))) {
                /* Device does not implement this command, that's OK. */
@@ -80,21 +81,45 @@ SR_PRIV int scpi_cmd_resp(const struct sr_dev_inst *sdi, GVariant **gvar,
        if (ret != SR_OK)
                return ret;
 
-       if (g_variant_type_equal(gvtype, G_VARIANT_TYPE_BOOLEAN)) {
+       /* Non-standard data type responses. */
+       if (command == SCPI_CMD_GET_OUTPUT_REGULATION) {
+               /*
+                * The Rigol DP800 series return CV/CC/UR, Philips PM2800
+                * return VOLT/CURR. We always return a GVariant string in
+                * the Rigol notation.
+                */
                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 (!strcmp(s, "CV") || !strcmp(s, "VOLT")) {
+                       *gvar = g_variant_new_string("CV");
+               } else if (!strcmp(s, "CC") || !strcmp(s, "CURR")) {
+                       *gvar = g_variant_new_string("CC");
+               } else if (!strcmp(s, "UR")) {
+                       *gvar = g_variant_new_string("UR");
+               } else {
+                       sr_dbg("Unknown response to SCPI_CMD_GET_OUTPUT_REGULATION: %s", s);
+                       ret = SR_ERR_DATA;
+               }
+               g_free(s);
+       } else {
+               /* Straight SCPI getters to GVariant types. */
+               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;
+                       g_free(s);
+               } 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;