Build: Set local include directories in Makefile.am

[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 247e41fb88a38fa8614c739932a9f6b8b0bd5679..063fddc1b563fe7bda406e4ff91447a40647cf54 100644 (file)
--- a/src/hardware/scpi-pps/protocol.h
+++ b/src/hardware/scpi-pps/protocol.h
@@ -22,32 +22,44 @@
 
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi-pps"
 
 enum pps_scpi_cmds {
-       SCPI_CMD_KEY_UNLOCK,
+       SCPI_CMD_REMOTE,
+       SCPI_CMD_LOCAL,
+       SCPI_CMD_BEEPER,
+       SCPI_CMD_BEEPER_ENABLE,
+       SCPI_CMD_BEEPER_DISABLE,
+       SCPI_CMD_SELECT_CHANNEL,
        SCPI_CMD_GET_MEAS_VOLTAGE,
        SCPI_CMD_GET_MEAS_CURRENT,
        SCPI_CMD_GET_MEAS_POWER,
-       SCPI_CMD_GET_VOLTAGE_MAX,
-       SCPI_CMD_SET_VOLTAGE_MAX,
-       SCPI_CMD_GET_CURRENT_MAX,
-       SCPI_CMD_SET_CURRENT_MAX,
+       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,
-       SCPI_CMD_SET_OUTPUT_ENABLED,
+       SCPI_CMD_SET_OUTPUT_ENABLE,
+       SCPI_CMD_SET_OUTPUT_DISABLE,
        SCPI_CMD_GET_OUTPUT_REGULATION,
        SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION,
-       SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION,
+       SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_ENABLE,
+       SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_DISABLE,
        SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ENABLED,
-       SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_ENABLED,
+       SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_ENABLE,
+       SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_DISABLE,
        SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ACTIVE,
        SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_THRESHOLD,
        SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD,
        SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ENABLED,
-       SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLED,
+       SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLE,
+       SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DISABLE,
        SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ACTIVE,
        SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD,
        SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD,
@@ -68,39 +80,55 @@ enum pps_features {
 };
 
 struct scpi_pps {
-       char *vendor;
-       char *model;
+       const char *vendor;
+       const char *model;
        uint64_t features;
-       const int32_t *devopts;
+       const uint32_t *devopts;
        unsigned int num_devopts;
-       const int32_t *devopts_cg;
+       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,
+               struct channel_group_spec **channel_groups, unsigned int *num_channel_groups);
 };
 
 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;
 };
 
+struct pps_channel {
+       int mq;
+       unsigned int hw_output_idx;
+       const char *hwname;
+};
+
+struct pps_channel_instance {
+       int mq;
+       int command;
+       const char *prefix;
+};
+
 struct pps_channel_group {
        uint64_t features;
 };
@@ -120,17 +148,25 @@ struct dev_context {
        void *cb_data;
 
        /* Operational state */
+       gboolean beeper_was_set;
+       struct channel_spec *channels;
+       struct channel_group_spec *channel_groups;
 
        /* Temporary state across callbacks */
-       int state;
        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, ...);
+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