X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-dmm%2Fprotocol.h;h=0206e77edb1064537ac5df9b3745ba4bda62ae97;hb=599f9e1deb6b6a4a75e00e29d86935845164eeed;hp=4a569df58d8f4cf504d795cabc5b3cd3b6b3244e;hpb=3cdad416e4231796e3b31380116404796622c6f5;p=libsigrok.git

diff --git a/src/hardware/scpi-dmm/protocol.h b/src/hardware/scpi-dmm/protocol.h
index 4a569df5..0206e77e 100644
--- a/src/hardware/scpi-dmm/protocol.h
+++ b/src/hardware/scpi-dmm/protocol.h
@@ -60,6 +60,9 @@ struct scpi_dmm_model {
 	const struct mqopt_item *mqopts;
 	size_t mqopt_size;
 	int (*get_measurement)(const struct sr_dev_inst *sdi, size_t ch);
+	const uint32_t *devopts;
+	size_t devopts_size;
+	unsigned int read_timeout_us; /* If zero, use default from src/scpi/scpi.c. */
 };
 
 struct dev_context {
@@ -88,12 +91,11 @@ SR_PRIV const struct mqopt_item *scpi_dmm_lookup_mq_number(
 SR_PRIV const struct mqopt_item *scpi_dmm_lookup_mq_text(
 	const struct sr_dev_inst *sdi, const char *text);
 SR_PRIV int scpi_dmm_get_mq(const struct sr_dev_inst *sdi,
-	enum sr_mq *mq, enum sr_mqflag *flag, char **rsp);
+	enum sr_mq *mq, enum sr_mqflag *flag, char **rsp,
+	const struct mqopt_item **mqitem);
 SR_PRIV int scpi_dmm_set_mq(const struct sr_dev_inst *sdi,
 	enum sr_mq mq, enum sr_mqflag flag);
 SR_PRIV int scpi_dmm_get_meas_agilent(const struct sr_dev_inst *sdi, size_t ch);
 SR_PRIV int scpi_dmm_receive_data(int fd, int revents, void *cb_data);
 
-SR_PRIV struct sr_dev_driver scpi_dmm_driver_info;
-
 #endif