X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fscpi-dmm%2Fprotocol.h;h=0206e77edb1064537ac5df9b3745ba4bda62ae97;hb=a267bf450cf4aad9390eff67cf2e6bce5bb8512c;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..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,7 +91,8 @@ 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);