X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi.h;h=e9e7084ba0876293a572a1a17327de221f4b69bd;hb=0f574e133c42b2c47a10c75424384e6efd6e0d6b;hp=28b33287629faf492f618f61657e6946089b3136;hpb=91ef511db2370904f8765a13e315fbddaf5ffe07;p=libsigrok.git

diff --git a/src/scpi.h b/src/scpi.h
index 28b33287..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 {
@@ -77,7 +84,7 @@ 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);
@@ -85,10 +92,12 @@ struct sr_scpi_dev_inst {
 	int (*read_begin)(void *priv);
 	int (*read_data)(void *priv, char *buf, int maxlen);
 	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;
 	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);