X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi.h;h=c70bd930fd5b2e42d284be08973516790b68ad2c;hb=a9a9bfaa6a388b288127b90d15bb9e82bbb35c2d;hp=28b33287629faf492f618f61657e6946089b3136;hpb=91ef511db2370904f8765a13e315fbddaf5ffe07;p=libsigrok.git diff --git a/src/scpi.h b/src/scpi.h index 28b33287..c70bd930 100644 --- a/src/scpi.h +++ b/src/scpi.h @@ -77,7 +77,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 +85,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,