define correct variable for the unified Rigol driver

[libsigrok.git] / proto.h

diff --git a/proto.h b/proto.h
index d2994d479a669dd360fd91411067968a5131d639..7ec6ae4f16905cdcfeb5fd25b1939d7ff32231d8 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -54,6 +54,8 @@ SR_API int sr_dev_trigger_set(const struct sr_dev_inst *sdi, int probenum,
 SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key);
 SR_API GSList *sr_dev_list(const struct sr_dev_driver *driver);
 SR_API int sr_dev_clear(const struct sr_dev_driver *driver);
+SR_API int sr_dev_open(struct sr_dev_inst *sdi);
+SR_API int sr_dev_close(struct sr_dev_inst *sdi);
 
 /*--- filter.c --------------------------------------------------------------*/
 
@@ -68,12 +70,17 @@ SR_API struct sr_dev_driver **sr_driver_list(void);
 SR_API int sr_driver_init(struct sr_context *ctx,
                struct sr_dev_driver *driver);
 SR_API GSList *sr_driver_scan(struct sr_dev_driver *driver, GSList *options);
-SR_API int sr_config_get(const struct sr_dev_driver *driver, int key,
-               GVariant **data, const struct sr_dev_inst *sdi);
-SR_API int sr_config_set(const struct sr_dev_inst *sdi, int key,
-               GVariant *data);
-SR_API int sr_config_list(const struct sr_dev_driver *driver, int key,
-               GVariant **data, const struct sr_dev_inst *sdi);
+SR_API int sr_config_get(const struct sr_dev_driver *driver,
+               const struct sr_dev_inst *sdi,
+               const struct sr_probe_group *probe_group,
+               int key, GVariant **data);
+SR_API int sr_config_set(const struct sr_dev_inst *sdi,
+               const struct sr_probe_group *probe_group,
+               int key, GVariant *data);
+SR_API int sr_config_list(const struct sr_dev_driver *driver,
+               const struct sr_dev_inst *sdi,
+               const struct sr_probe_group *probe_group,
+               int key, GVariant **data);
 SR_API const struct sr_config_info *sr_config_info_get(int key);
 SR_API const struct sr_config_info *sr_config_info_name_get(const char *optname);
 
@@ -88,6 +95,7 @@ SR_API struct sr_session *sr_session_new(void);
 SR_API int sr_session_destroy(void);
 SR_API int sr_session_dev_remove_all(void);
 SR_API int sr_session_dev_add(const struct sr_dev_inst *sdi);
+SR_API int sr_session_dev_list(GSList **devlist);
 
 /* Datafeed setup */
 SR_API int sr_session_datafeed_callback_remove_all(void);
@@ -100,6 +108,8 @@ SR_API int sr_session_run(void);
 SR_API int sr_session_stop(void);
 SR_API int sr_session_save(const char *filename, const struct sr_dev_inst *sdi,
                unsigned char *buf, int unitsize, int units);
+SR_API int sr_session_append(const char *filename, unsigned char *buf,
+               int unitsize, int units);
 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,