From: Bert Vermeulen <redacted>
Date: Sun, 26 Oct 2014 23:37:04 +0000 (+0100)
Subject: scpi-pps: Publish driver options.
X-Git-Tag: libsigrok-0.4.0~821
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=a258204e00715c44b0d013ee3141ce890c8ea71c;hp=390795c0999ae3a41b97f9a8e2c154c81e6d064e

scpi-pps: Publish driver options.
---

diff --git a/src/hardware/scpi-pps/api.c b/src/hardware/scpi-pps/api.c
index 2ed2c976..c8502fc5 100644
--- a/src/hardware/scpi-pps/api.c
+++ b/src/hardware/scpi-pps/api.c
@@ -30,6 +30,11 @@ static const uint32_t scanopts[] = {
 	SR_CONF_SERIALCOMM,
 };
 
+static const uint32_t devopts_driver[] = {
+	SR_CONF_POWER_SUPPLY,
+	SR_CONF_CONTINUOUS,
+};
+
 static struct pps_channel_instance pci[] = {
 	{ SR_MQ_VOLTAGE, SCPI_CMD_GET_MEAS_VOLTAGE, "V" },
 	{ SR_MQ_CURRENT, SCPI_CMD_GET_MEAS_CURRENT, "I" },
@@ -424,6 +429,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,
+				devopts_driver, ARRAY_SIZE(devopts_driver), sizeof(uint32_t));
+		return SR_OK;
 	}
 
 	if (!sdi)
diff --git a/src/hardware/scpi-pps/profiles.c b/src/hardware/scpi-pps/profiles.c
index 5be14127..bd23cb94 100644
--- a/src/hardware/scpi-pps/profiles.c
+++ b/src/hardware/scpi-pps/profiles.c
@@ -44,8 +44,6 @@ static const uint32_t devopts_none[] = { };
 
 /* Rigol DP800 series */
 static const uint32_t rigol_dp800_devopts[] = {
-	SR_CONF_POWER_SUPPLY,
-	SR_CONF_CONTINUOUS,
 	SR_CONF_OVER_TEMPERATURE_PROTECTION | SR_CONF_GET | SR_CONF_SET,
 };
 
@@ -119,8 +117,6 @@ struct scpi_command rigol_dp800_cmd[] = {
 
 /* HP 663xx series */
 static const uint32_t hp_6632b_devopts[] = {
-	SR_CONF_POWER_SUPPLY,
-	SR_CONF_CONTINUOUS,
 	SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET,
 	SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET,
 	SR_CONF_OUTPUT_CURRENT | SR_CONF_GET,
@@ -149,11 +145,6 @@ struct scpi_command hp_6632b_cmd[] = {
 };
 
 /* Philips/Fluke PM2800 series */
-static const uint32_t philips_pm2800_devopts[] = {
-	SR_CONF_POWER_SUPPLY,
-	SR_CONF_CONTINUOUS,
-};
-
 static const uint32_t philips_pm2800_devopts_cg[] = {
 	SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET,
 	SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET,
@@ -327,7 +318,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 
 	/* Philips/Fluke PM2800 series */
 	{ "Philips", "^PM28[13][123]/[01234]{1,2}$", 0,
-		ARRAY_AND_SIZE(philips_pm2800_devopts),
+		ARRAY_AND_SIZE(devopts_none),
 		ARRAY_AND_SIZE(philips_pm2800_devopts_cg),
 		NULL, 0,
 		NULL, 0,