Change type of SR_CONF keys to uint32_t.

[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 25b55cb1d372ea7c331d2cc47103ecbc95aee783..552d5030a0e752f08360442cf22150afb122e9ea 100644 (file)
--- a/src/hardware/scpi-pps/protocol.h
+++ b/src/hardware/scpi-pps/protocol.h
@@ -51,8 +51,6 @@ enum pps_scpi_cmds {
        SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ACTIVE,
        SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD,
        SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD,
-       SCPI_CMD_GET_OUTPUT_CHANNEL_CONFIG,
-       SCPI_CMD_SET_OUTPUT_CHANNEL_CONFIG,
 };
 
 /*
@@ -70,12 +68,12 @@ enum pps_features {
 };
 
 struct scpi_pps {
-       char *idn_vendor;
-       char *idn_model;
+       char *vendor;
+       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;
        unsigned int num_channels;
@@ -103,6 +101,18 @@ struct channel_group_spec {
        uint64_t features;
 };
 
+struct pps_channel {
+       int mq;
+       unsigned int hw_output_idx;
+       char *hwname;
+};
+
+struct pps_channel_instance {
+       int mq;
+       int command;
+       char *prefix;
+};
+
 struct pps_channel_group {
        uint64_t features;
 };
@@ -124,12 +134,14 @@ struct dev_context {
        /* Operational state */
 
        /* 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 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 scpi_pps_receive_data(int fd, int revents, void *cb_data);
 
 #endif