X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-dmm%2Fprotocol.h;h=5261168f3edba1daea4f4dd8a25e862bf1c7f230;hb=ddeaa49d431f3cb79a4d3e9f07fcc636797944ca;hp=0881074ce9ef2715b381c60d98bbb78bd9fd9955;hpb=0617bb5a4e22c78c9603ae8a7d93506cfacde246;p=libsigrok.git

diff --git a/src/hardware/scpi-dmm/protocol.h b/src/hardware/scpi-dmm/protocol.h
index 0881074c..5261168f 100644
--- a/src/hardware/scpi-dmm/protocol.h
+++ b/src/hardware/scpi-dmm/protocol.h
@@ -40,6 +40,7 @@ enum scpi_dmm_cmdcode {
 	DMM_CMD_STOP_ACQ,
 	DMM_CMD_QUERY_VALUE,
 	DMM_CMD_QUERY_PREC,
+	DMM_CMD_SETUP_LOCAL,
 };
 
 struct mqopt_item {
@@ -60,6 +61,10 @@ 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. */
+	float infinity_limit; /* If zero, use default from protocol.c */
 };
 
 struct dev_context {
@@ -80,6 +85,7 @@ struct dev_context {
 		struct sr_analog_meaning meaning[SCPI_DMM_MAX_CHANNELS];
 		struct sr_analog_spec spec[SCPI_DMM_MAX_CHANNELS];
 	} run_acq_info;
+	gchar *precision;
 };
 
 SR_PRIV void scpi_dmm_cmd_delay(struct sr_scpi_dev_inst *scpi);
@@ -88,10 +94,12 @@ 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_get_meas_gwinstek(const struct sr_dev_inst *sdi, size_t ch);
 SR_PRIV int scpi_dmm_receive_data(int fd, int revents, void *cb_data);
 
 #endif