scpi-pps: Publish driver options.

[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 fc06e906370372729d44f79fe46a661af8b445ff..c8502fc5591474e7a1d7d65dd27590a9c5a42e81 100644 (file)
--- 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" },
@@ -252,7 +257,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 +342,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 +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)