X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fapi.c;h=c8070a063335538109aaa278ae96f4a112e9e7ae;hb=61f2b7f74cd2d05cacb2bfb3cad2c2d67c856f47;hp=fc06e906370372729d44f79fe46a661af8b445ff;hpb=4a471029c230a7e2e0b15528d22bf30fb7cf2472;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/api.c b/src/hardware/scpi-pps/api.c
index fc06e906..c8070a06 100644
--- a/src/hardware/scpi-pps/api.c
+++ b/src/hardware/scpi-pps/api.c
@@ -30,6 +30,10 @@ static const uint32_t scanopts[] = {
 	SR_CONF_SERIALCOMM,
 };
 
+static const uint32_t drvopts[] = {
+	SR_CONF_POWER_SUPPLY,
+};
+
 static struct pps_channel_instance pci[] = {
 	{ SR_MQ_VOLTAGE, SCPI_CMD_GET_MEAS_VOLTAGE, "V" },
 	{ SR_MQ_CURRENT, SCPI_CMD_GET_MEAS_CURRENT, "I" },
@@ -85,8 +89,11 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 		return NULL;
 	}
 
-	sdi = sr_dev_inst_new(SR_ST_ACTIVE, vendor, hw_info->model,
-			hw_info->firmware_version);
+	sdi = g_malloc0(sizeof(struct sr_dev_inst));
+	sdi->status = SR_ST_ACTIVE;
+	sdi->vendor = g_strdup(vendor);
+	sdi->model = g_strdup(hw_info->model);
+	sdi->version = g_strdup(hw_info->firmware_version);
 	sdi->conn = scpi;
 	sdi->driver = di;
 	sdi->inst_type = SR_INST_SCPI;
@@ -252,7 +259,6 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 	const GVariantType *gvtype;
 	unsigned int i;
 	int cmd, ret;
-	const char *s;
 
 	if (!sdi)
 		return SR_ERR_ARG;
@@ -338,25 +344,6 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 		if (cg)
 			select_channel(sdi, cg->channels->data);
 		ret = scpi_cmd_resp(sdi, data, gvtype, cmd);
-
-		if (gvtype == G_VARIANT_TYPE_STRING && ret == SR_OK) {
-			/* Non-standard data type responses. */
-			switch (key) {
-			case SCPI_CMD_GET_OUTPUT_REGULATION:
-				/*
-				 * This is specific to the Rigol DP800 series.
-				 * We return the same string for now until more
-				 * models with this key are supported. Do a check
-				 * just for the hell of it.
-				 */
-				s = g_variant_get_string(*data, NULL);
-				if (strcmp(s, "CC") && strcmp(s, "CV") && strcmp(s, "UR")) {
-					sr_dbg("Unknown response to SCPI_CMD_GET_OUTPUT_REGULATION: %s", s);
-					ret = SR_ERR_DATA;
-				}
-				break;
-			}
-		}
 	} else
 		ret = SR_ERR_NA;
 
@@ -444,6 +431,10 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
 				scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
 		return SR_OK;
+	} else if (key == SR_CONF_DEVICE_OPTIONS && !sdi) {
+		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+				drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
+		return SR_OK;
 	}
 
 	if (!sdi)