X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi.h;h=13b2d3011d543149d80ad56cfb45fe1a0e290527;hb=9e111972465bc094edf571e9426ffb3f8895655e;hp=6fc99f7d1f42cc277c9e0e30e2b90fab2e84a83e;hpb=fd20e59caa4b2b05ddbca55f77ff8b1cf8ae0446;p=libsigrok.git

diff --git a/src/scpi.h b/src/scpi.h
index 6fc99f7d..13b2d301 100644
--- a/src/scpi.h
+++ b/src/scpi.h
@@ -100,6 +100,7 @@ struct sr_scpi_dev_inst {
 	/* 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,12 +149,18 @@ 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_scpi_unquote_string(char *s);
+
 SR_PRIV const char *sr_vendor_alias(const char *raw_vendor);
-SR_PRIV const char *sr_scpi_cmd_get(const struct scpi_command *cmdtable, int command);
+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, ...);
+		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