scpi: Update names of a few *_OUTPUT_* items.

[libsigrok.git] / src / hardware / scpi-pps / protocol.h

diff --git a/src/hardware/scpi-pps/protocol.h b/src/hardware/scpi-pps/protocol.h
index 7a06093fb3ad2d8079c49cb9e0f42325b89c8ccd..4956e5d4cb0ff8cfe9f116abecf0e548a65db2a1 100644 (file)
--- a/src/hardware/scpi-pps/protocol.h
+++ b/src/hardware/scpi-pps/protocol.h
@@ -37,8 +37,11 @@ enum pps_scpi_cmds {
        SCPI_CMD_GET_MEAS_VOLTAGE,
        SCPI_CMD_GET_MEAS_CURRENT,
        SCPI_CMD_GET_MEAS_POWER,
+       SCPI_CMD_GET_MEAS_FREQUENCY,
        SCPI_CMD_GET_VOLTAGE_TARGET,
        SCPI_CMD_SET_VOLTAGE_TARGET,
+       SCPI_CMD_GET_FREQUENCY_TARGET,
+       SCPI_CMD_SET_FREQUENCY_TARGET,
        SCPI_CMD_GET_CURRENT_LIMIT,
        SCPI_CMD_SET_CURRENT_LIMIT,
        SCPI_CMD_GET_OUTPUT_ENABLED,
@@ -77,18 +80,18 @@ enum pps_features {
 };
 
 struct scpi_pps {
-       char *vendor;
-       char *model;
+       const char *vendor;
+       const char *model;
        uint64_t features;
        const uint32_t *devopts;
        unsigned int num_devopts;
        const uint32_t *devopts_cg;
        unsigned int num_devopts_cg;
-       struct channel_spec *channels;
+       const struct channel_spec *channels;
        unsigned int num_channels;
-       struct channel_group_spec *channel_groups;
+       const struct channel_group_spec *channel_groups;
        unsigned int num_channel_groups;
-       struct scpi_command *commands;
+       const struct scpi_command *commands;
        unsigned int num_commands;
        int (*probe_channels) (struct sr_dev_inst *sdi, struct sr_scpi_hw_info *hwinfo,
                struct channel_spec **channels, unsigned int *num_channels,
@@ -96,19 +99,20 @@ struct scpi_pps {
 };
 
 struct channel_spec {
-       char *name;
+       const char *name;
        /* Min, max, programming resolution. */
        float voltage[3];
        float current[3];
+       float frequency[3];
 };
 
 struct scpi_command {
        int command;
-       char *string;
+       const char *string;
 };
 
 struct channel_group_spec {
-       char *name;
+       const char *name;
        uint64_t channel_index_mask;
        uint64_t features;
 };
@@ -116,13 +120,13 @@ struct channel_group_spec {
 struct pps_channel {
        int mq;
        unsigned int hw_output_idx;
-       char *hwname;
+       const char *hwname;
 };
 
 struct pps_channel_instance {
        int mq;
        int command;
-       char *prefix;
+       const char *prefix;
 };
 
 struct pps_channel_group {
@@ -152,8 +156,11 @@ struct dev_context {
        struct sr_channel *cur_channel;
 };
 
-const char *get_vendor(const char *raw_vendor);
-SR_PRIV char *scpi_cmd_get(const struct sr_dev_inst *sdi, int command);
+SR_PRIV extern unsigned int num_pps_profiles;
+SR_PRIV extern const struct scpi_pps pps_profiles[];
+
+SR_PRIV const char *get_vendor(const char *raw_vendor);
+SR_PRIV const char *scpi_cmd_get(const struct sr_dev_inst *sdi, int command);
 SR_PRIV int scpi_cmd(const struct sr_dev_inst *sdi, int command, ...);
 SR_PRIV int scpi_cmd_resp(const struct sr_dev_inst *sdi, GVariant **gvar,
                const GVariantType *gvtype, int command, ...);