scpi: Synchronize read, write and write+read operations.

[libsigrok.git] / src / scpi.h

diff --git a/src/scpi.h b/src/scpi.h
index bafdbe62314dcd0b55439b27dc1b90661db5c203..6fc99f7d1f42cc277c9e0e30e2b90fab2e84a83e 100644 (file)
--- a/src/scpi.h
+++ b/src/scpi.h
@@ -63,7 +63,6 @@ enum {
        SCPI_CMD_SET_PROBE_UNIT,
        SCPI_CMD_GET_ANALOG_CHAN_NAME,
        SCPI_CMD_GET_DIG_CHAN_NAME,
-       SCPI_CMD_GET_BYTE_ORDER,
 };
 
 struct scpi_command {
@@ -92,13 +91,15 @@ struct sr_scpi_dev_inst {
        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)(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;
 };
 
 SR_PRIV GSList *sr_scpi_scan(struct drv_context *drvc, GSList *options,
@@ -117,10 +118,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,
@@ -145,10 +149,10 @@ SR_PRIV int sr_scpi_get_hw_id(struct sr_scpi_dev_inst *scpi,
 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,
+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 command, ...);
-SR_PRIV int scpi_cmd_resp(const struct sr_dev_inst *sdi,
+SR_PRIV int sr_scpi_cmd_resp(const struct sr_dev_inst *sdi,
                const struct scpi_command *cmdtable,
                GVariant **gvar, const GVariantType *gvtype, int command, ...);