drivers: Remove some uneeded 'ret' variables.

[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..80593ceca8ad54ed205e7db214a9bcd56f4f64d2 100644 (file)
--- a/src/hardware/scpi-pps/protocol.h
+++ b/src/hardware/scpi-pps/protocol.h
@@ -22,8 +22,9 @@
 
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
+#include "scpi.h"
 
 #define LOG_PREFIX "scpi-pps"
 
@@ -37,8 +38,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,52 +81,49 @@ 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;
-       unsigned int num_commands;
+       const struct scpi_command *commands;
        int (*probe_channels) (struct sr_dev_inst *sdi, struct sr_scpi_hw_info *hwinfo,
                struct channel_spec **channels, unsigned int *num_channels,
                struct channel_group_spec **channel_groups, unsigned int *num_channel_groups);
 };
 
 struct channel_spec {
-       char *name;
-       /* Min, max, programming resolution. */
-       float voltage[3];
-       float current[3];
-};
-
-struct scpi_command {
-       int command;
-       char *string;
+       const char *name;
+       /* Min, max, programming resolution, spec digits, encoding digits. */
+       float voltage[5];
+       float current[5];
+       float power[5];
+       float frequency[5];
 };
 
 struct channel_group_spec {
-       char *name;
+       const char *name;
        uint64_t channel_index_mask;
        uint64_t features;
 };
 
 struct pps_channel {
-       int mq;
+       enum sr_mq mq;
        unsigned int hw_output_idx;
-       char *hwname;
+       const char *hwname;
+       int digits;
 };
 
 struct pps_channel_instance {
-       int mq;
+       enum sr_mq mq;
        int command;
-       char *prefix;
+       const char *prefix;
 };
 
 struct pps_channel_group {
@@ -140,9 +141,6 @@ struct dev_context {
        /* Model-specific information */
        const struct scpi_pps *device;
 
-       /* Acquisition settings */
-       void *cb_data;
-
        /* Operational state */
        gboolean beeper_was_set;
        struct channel_spec *channels;
@@ -152,14 +150,10 @@ 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 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, ...);
+SR_PRIV extern unsigned int num_pps_profiles;
+SR_PRIV extern const struct scpi_pps pps_profiles[];
+
 SR_PRIV int select_channel(const struct sr_dev_inst *sdi, struct sr_channel *ch);
-SR_PRIV struct sr_channel *next_enabled_channel(const struct sr_dev_inst *sdi,
-               struct sr_channel *cur_channel);
 SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data);
 
 #endif