X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi.h;h=e9e7084ba0876293a572a1a17327de221f4b69bd;hb=417412c8f88bd71fe5da5c80db0866d48c6908b3;hp=aee1bfba836809c711c93849c529b24893267719;hpb=04229f7bfc750f2b67e8dd54ac82ae6bb7eae1e4;p=libsigrok.git

diff --git a/src/scpi.h b/src/scpi.h
index aee1bfba..e9e7084b 100644
--- 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 {
@@ -89,6 +96,8 @@ struct sr_scpi_dev_inst {
 	void (*free)(void *priv);
 	unsigned int read_timeout_ms;
 	void *priv;
+	/* Only used for quirk workarounds, notably the Rigol DS1000 series. */
+	uint64_t firmware_version;
 };
 
 SR_PRIV GSList *sr_scpi_scan(struct drv_context *drvc, GSList *options,
@@ -126,6 +135,10 @@ 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);