Backport recent changes from mainline.

[libsigrok.git] / src / scpi.h

diff --git a/src/scpi.h b/src/scpi.h
index 932300624e437ddaa063f3880da0b2af4c68181c..e55d36f1513880d84a8d6119a92c59abc507a0d1 100644 (file)
--- a/src/scpi.h
+++ b/src/scpi.h
@@ -99,6 +99,8 @@ struct sr_scpi_dev_inst {
        void *priv;
        /* Only used for quirk workarounds, notably the Rigol DS1000 series. */
        uint64_t firmware_version;
+       GMutex scpi_mutex;
+       char *actual_channel_name;
 };
 
 SR_PRIV GSList *sr_scpi_scan(struct drv_context *drvc, GSList *options,
@@ -148,11 +150,15 @@ 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,
-               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