X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fapi.c;h=475cdca3eb9064bbb8cfac3b90b2d8c1b07a3196;hb=3be42bc22f8b36599a448273c12a76d3e0f7a940;hp=1210b81c6e1ef7554dca21ce2b28e678cd88481c;hpb=9c24d16a1d01a01f88f254fbd5f5e413e796f3cf;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/api.c b/src/hardware/scpi-pps/api.c
index 1210b81c..475cdca3 100644
--- 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))
@@ -90,7 +91,6 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 	}
 
 	sdi = g_malloc0(sizeof(struct sr_dev_inst));
-	sdi->status = SR_ST_INACTIVE;
 	sdi->vendor = g_strdup(vendor);
 	sdi->model = g_strdup(hw_info->model);
 	sdi->version = g_strdup(hw_info->firmware_version);
@@ -167,7 +167,6 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 	hw_info = NULL;
 
 	scpi_cmd(sdi, devc->device->commands, SCPI_CMD_LOCAL);
-	sr_scpi_close(scpi);
 
 	return sdi;
 }
@@ -261,7 +260,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 	const GVariantType *gvtype;
 	unsigned int i;
 	int cmd, ret;
-	char *s;
+	const char *s;
 
 	if (!sdi)
 		return SR_ERR_ARG;
@@ -364,19 +363,20 @@ 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;
-		if (!strcmp(s, "CV") || !strcmp(s, "VOLT")) {
+		s = g_variant_get_string(*data, NULL);
+		if (!strcmp(s, "VOLT")) {
+			g_variant_unref(*data);
 			*data = g_variant_new_string("CV");
-		} else if (!strcmp(s, "CC") || !strcmp(s, "CURR")) {
+		} else if (!strcmp(s, "CURR")) {
+			g_variant_unref(*data);
 			*data = g_variant_new_string("CC");
-		} else if (!strcmp(s, "UR")) {
-			*data = g_variant_new_string("UR");
-		} else {
+		}
+
+		s = g_variant_get_string(*data, NULL);
+		if (strcmp(s, "CV") && strcmp(s, "CC") && strcmp(s, "UR")) {
 			sr_dbg("Unknown response to SCPI_CMD_GET_OUTPUT_REGULATION: %s", s);
 			ret = SR_ERR_DATA;
 		}
-		g_free(s);
 	}
 
 	return ret;
@@ -400,7 +400,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 		select_channel(sdi, cg->channels->data);
 
 	devc = sdi->priv;
-	ret = SR_OK;
+
 	switch (key) {
 	case SR_CONF_ENABLED:
 		if (g_variant_get_boolean(data))
@@ -618,7 +618,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
-	struct sr_datafeed_packet packet;
 	struct sr_scpi_dev_inst *scpi;
 	float f;
 
@@ -637,8 +636,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 	sr_scpi_get_float(scpi, NULL, &f);
 	sr_scpi_source_remove(sdi->session, scpi);
 
-	packet.type = SR_DF_END;
-	sr_session_send(sdi, &packet);
+	std_session_send_df_end(sdi, LOG_PREFIX);
 
 	return SR_OK;
 }