X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=proto.h;h=7ac3d09e480b7151fce56a623207eac30d1a3d9d;hb=8012ae1e3b40a88bbe20deaded7d66942a82380e;hp=f8651a124858733c44bab8661c7a343bc2bb9583;hpb=a10ddf9ba04429d6762171a3bbbac12a7717ef59;p=libsigrok.git diff --git a/proto.h b/proto.h index f8651a12..7ac3d09e 100644 --- a/proto.h +++ b/proto.h @@ -47,8 +47,8 @@ SR_API int sr_datastore_put(struct sr_datastore *ds, void *data, /*--- device.c --------------------------------------------------------------*/ -SR_API int sr_dev_probe_name_set(struct sr_dev *dev, int probenum, - const char *name); +SR_API int sr_dev_probe_name_set(const struct sr_dev_inst *sdi, + int probenum, const char *name); SR_API int sr_dev_probe_enable(const struct sr_dev_inst *sdi, int probenum, gboolean state); SR_API int sr_dev_trigger_set(const struct sr_dev_inst *sdi, int probenum, @@ -67,11 +67,11 @@ SR_API int sr_filter_probes(int in_unitsize, int out_unitsize, SR_API struct sr_dev_driver **sr_driver_list(void); SR_API int sr_driver_init(struct sr_dev_driver *driver); SR_API GSList *sr_driver_scan(struct sr_dev_driver *driver, GSList *options); +SR_API int sr_info_get(struct sr_dev_driver *driver, int id, + const void **data, const struct sr_dev_inst *sdi); SR_API gboolean sr_driver_hwcap_exists(struct sr_dev_driver *driver, int hwcap); SR_API const struct sr_hwcap_option *sr_drvopt_get(int hwopt); SR_API const struct sr_hwcap_option *sr_hw_hwcap_get(int hwcap); -SR_API int sr_info_get(struct sr_dev_driver *driver, int id, - const void **data, const struct sr_dev_inst *sdi); /*--- session.c -------------------------------------------------------------*/ @@ -94,7 +94,8 @@ SR_API int sr_session_start(void); SR_API int sr_session_run(void); SR_API int sr_session_halt(void); SR_API int sr_session_stop(void); -SR_API int sr_session_save(const char *filename); +SR_API int sr_session_save(const char *filename, + const struct sr_dev_inst *sdi, struct sr_datastore *ds); SR_API int sr_session_source_add(int fd, int events, int timeout, sr_receive_data_callback_t cb, void *cb_data); SR_API int sr_session_source_add_pollfd(GPollFD *pollfd, int timeout,