scpi-pps: sr_scpi_get_string() is already called by scpi_cmd_resp()

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

diff --git a/src/hardware/scpi-pps/api.c b/src/hardware/scpi-pps/api.c
index 58e14f6e08abdaf9cf8848efad9fc0a0a6611401..294c5a0e8e4617c8cb4f15715169347b7bcccf51 100644 (file)
--- a/src/hardware/scpi-pps/api.c
+++ b/src/hardware/scpi-pps/api.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <string.h>
 #include <strings.h>
 #include "scpi.h"
@@ -74,7 +75,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
        device = NULL;
        for (i = 0; i < num_pps_profiles; i++) {
                vendor = sr_vendor_alias(hw_info->manufacturer);
-               if (strcasecmp(vendor, pps_profiles[i].vendor))
+               if (g_ascii_strcasecmp(vendor, pps_profiles[i].vendor))
                        continue;
                model_re = g_regex_new(pps_profiles[i].model, 0, 0, NULL);
                if (g_regex_match(model_re, hw_info->model, 0, &model_mi))
@@ -364,8 +365,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
                 * return VOLT/CURR. We always return a GVariant string in
                 * the Rigol notation.
                 */
-               if ((ret = sr_scpi_get_string(sdi->conn, NULL, &s)) != SR_OK)
-                       return ret;
+               s = g_variant_get_string(*data, NULL);
                if (!strcmp(s, "CV") || !strcmp(s, "VOLT")) {
                        *data = g_variant_new_string("CV");
                } else if (!strcmp(s, "CC") || !strcmp(s, "CURR")) {
@@ -597,7 +597,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        std_session_send_df_header(sdi, LOG_PREFIX);
 
        /* Prime the pipe with the first channel's fetch. */
-       ch = next_enabled_channel(sdi, NULL);
+       ch = sr_next_enabled_channel(sdi, NULL);
        pch = ch->priv;
        if ((ret = select_channel(sdi, ch)) < 0)
                return ret;