scpi-pps: Reimplemention of switching channel groups (PSU channels)

[libsigrok.git] / src / scpi.h

diff --git a/src/scpi.h b/src/scpi.h
index 28b33287629faf492f618f61657e6946089b3136..f4fe651b94dee45a34dea4784f5ab48e71e63ae3 100644 (file)
--- a/src/scpi.h
+++ b/src/scpi.h
@@ -56,6 +56,13 @@ enum {
        SCPI_CMD_GET_DIG_DATA,
        SCPI_CMD_GET_SAMPLE_RATE,
        SCPI_CMD_GET_SAMPLE_RATE_LIVE,
+       SCPI_CMD_GET_DATA_FORMAT,
+       SCPI_CMD_GET_PROBE_FACTOR,
+       SCPI_CMD_SET_PROBE_FACTOR,
+       SCPI_CMD_GET_PROBE_UNIT,
+       SCPI_CMD_SET_PROBE_UNIT,
+       SCPI_CMD_GET_ANALOG_CHAN_NAME,
+       SCPI_CMD_GET_DIG_CHAN_NAME,
 };
 
 struct scpi_command {
@@ -77,18 +84,23 @@ struct sr_scpi_dev_inst {
        GSList *(*scan)(struct drv_context *drvc);
        int (*dev_inst_new)(void *priv, struct drv_context *drvc,
                const char *resource, char **params, const char *serialcomm);
-       int (*open)(void *priv);
+       int (*open)(struct sr_scpi_dev_inst *scpi);
        int (*source_add)(struct sr_session *session, void *priv, int events,
                int timeout, sr_receive_data_callback cb, void *cb_data);
        int (*source_remove)(struct sr_session *session, void *priv);
        int (*send)(void *priv, const char *command);
        int (*read_begin)(void *priv);
        int (*read_data)(void *priv, char *buf, int maxlen);
+       int (*write_data)(void *priv, char *buf, int len);
        int (*read_complete)(void *priv);
-       int (*close)(void *priv);
+       int (*close)(struct sr_scpi_dev_inst *scpi);
        void (*free)(void *priv);
-       unsigned int read_timeout_ms;
+       unsigned int read_timeout_us;
        void *priv;
+       /* Only used for quirk workarounds, notably the Rigol DS1000 series. */
+       uint64_t firmware_version;
+       GMutex scpi_mutex;
+       const char *actual_channel_name;
 };
 
 SR_PRIV GSList *sr_scpi_scan(struct drv_context *drvc, GSList *options,
@@ -107,10 +119,13 @@ SR_PRIV int sr_scpi_send_variadic(struct sr_scpi_dev_inst *scpi,
                const char *format, va_list args);
 SR_PRIV int sr_scpi_read_begin(struct sr_scpi_dev_inst *scpi);
 SR_PRIV int sr_scpi_read_data(struct sr_scpi_dev_inst *scpi, char *buf, int maxlen);
+SR_PRIV int sr_scpi_write_data(struct sr_scpi_dev_inst *scpi, char *buf, int len);
 SR_PRIV int sr_scpi_read_complete(struct sr_scpi_dev_inst *scpi);
 SR_PRIV int sr_scpi_close(struct sr_scpi_dev_inst *scpi);
 SR_PRIV void sr_scpi_free(struct sr_scpi_dev_inst *scpi);
 
+SR_PRIV int sr_scpi_read_response(struct sr_scpi_dev_inst *scpi,
+                       GString *response, gint64 abs_timeout_us);
 SR_PRIV int sr_scpi_get_string(struct sr_scpi_dev_inst *scpi,
                        const char *command, char **scpi_response);
 SR_PRIV int sr_scpi_get_bool(struct sr_scpi_dev_inst *scpi,
@@ -126,16 +141,24 @@ SR_PRIV int sr_scpi_get_floatv(struct sr_scpi_dev_inst *scpi,
                        const char *command, GArray **scpi_response);
 SR_PRIV int sr_scpi_get_uint8v(struct sr_scpi_dev_inst *scpi,
                        const char *command, GArray **scpi_response);
+SR_PRIV int sr_scpi_get_data(struct sr_scpi_dev_inst *scpi,
+                       const char *command, GString **scpi_response);
+SR_PRIV int sr_scpi_get_block(struct sr_scpi_dev_inst *scpi,
+                       const char *command, GByteArray **scpi_response);
 SR_PRIV int sr_scpi_get_hw_id(struct sr_scpi_dev_inst *scpi,
                        struct sr_scpi_hw_info **scpi_response);
 SR_PRIV void sr_scpi_hw_info_free(struct sr_scpi_hw_info *hw_info);
 
 SR_PRIV const char *sr_vendor_alias(const char *raw_vendor);
-SR_PRIV const char *scpi_cmd_get(const struct scpi_command *cmdtable, int command);
-SR_PRIV int scpi_cmd(const struct sr_dev_inst *sdi,
-               const struct scpi_command *cmdtable, int command, ...);
-SR_PRIV int scpi_cmd_resp(const struct sr_dev_inst *sdi,
+SR_PRIV const char *sr_scpi_cmd_get(const struct scpi_command *cmdtable,
+               int command);
+SR_PRIV int sr_scpi_cmd(const struct sr_dev_inst *sdi,
                const struct scpi_command *cmdtable,
+               int channel_command, const char *channel_name,
+               int command, ...);
+SR_PRIV int sr_scpi_cmd_resp(const struct sr_dev_inst *sdi,
+               const struct scpi_command *cmdtable,
+               int channel_command, const char *channel_name,
                GVariant **gvar, const GVariantType *gvtype, int command, ...);
 
 #endif