X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprofiles.c;h=efd871931b1682ffa88e4a2277de27f168af9131;hb=5305266a28c1af09267f43f8941b6012be3d954f;hp=34f4a6a374a306e1408758469a6abe0bd001fafa;hpb=bfc8679937df1b62ee961f1c576555fc8575e5ad;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/profiles.c b/src/hardware/scpi-pps/profiles.c
index 34f4a6a3..efd87193 100644
--- a/src/hardware/scpi-pps/profiles.c
+++ b/src/hardware/scpi-pps/profiles.c
@@ -39,28 +39,28 @@ const char *get_vendor(const char *raw_vendor)
 	return raw_vendor;
 }
 
-static const int32_t devopts_none[] = { };
+static const uint32_t devopts_none[] = { };
 
 /* Rigol DP800 series */
-static const int32_t rigol_dp800_devopts[] = {
+static const uint32_t rigol_dp800_devopts[] = {
 	SR_CONF_POWER_SUPPLY,
 	SR_CONF_CONTINUOUS,
-	SR_CONF_OVER_TEMPERATURE_PROTECTION,
+	SR_CONF_OVER_TEMPERATURE_PROTECTION | SR_CONF_GET | SR_CONF_SET,
 };
 
-static const int32_t rigol_dp800_devopts_cg[] = {
-	SR_CONF_OUTPUT_REGULATION,
-	SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED,
-	SR_CONF_OVER_VOLTAGE_PROTECTION_ACTIVE,
-	SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD,
-	SR_CONF_OVER_CURRENT_PROTECTION_ENABLED,
-	SR_CONF_OVER_CURRENT_PROTECTION_ACTIVE,
-	SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD,
-	SR_CONF_OUTPUT_VOLTAGE,
-	SR_CONF_OUTPUT_VOLTAGE_MAX,
-	SR_CONF_OUTPUT_CURRENT,
-	SR_CONF_OUTPUT_CURRENT_MAX,
-	SR_CONF_OUTPUT_ENABLED,
+static const uint32_t rigol_dp800_devopts_cg[] = {
+	SR_CONF_OUTPUT_REGULATION | SR_CONF_GET,
+	SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_OVER_VOLTAGE_PROTECTION_ACTIVE | SR_CONF_GET,
+	SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_OVER_CURRENT_PROTECTION_ACTIVE | SR_CONF_GET,
+	SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET,
+	SR_CONF_OUTPUT_VOLTAGE_MAX | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_OUTPUT_CURRENT | SR_CONF_GET,
+	SR_CONF_OUTPUT_CURRENT_MAX | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET,
 };
 
 struct channel_spec rigol_dp831_ch[] = {
@@ -108,14 +108,14 @@ struct scpi_command rigol_dp800_cmd[] = {
 };
 
 /* HP 663xx series */
-static const int32_t hp_6632b_devopts[] = {
+static const uint32_t hp_6632b_devopts[] = {
 	SR_CONF_POWER_SUPPLY,
 	SR_CONF_CONTINUOUS,
-	SR_CONF_OUTPUT_ENABLED,
-	SR_CONF_OUTPUT_VOLTAGE,
-	SR_CONF_OUTPUT_CURRENT,
-	SR_CONF_OUTPUT_VOLTAGE_MAX,
-	SR_CONF_OUTPUT_CURRENT_MAX,
+	SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET,
+	SR_CONF_OUTPUT_CURRENT | SR_CONF_GET,
+	SR_CONF_OUTPUT_VOLTAGE_MAX | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_OUTPUT_CURRENT_MAX | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
 struct channel_spec hp_6632b_ch[] = {