Rename a few more API calls with 'probe' in their name.

[libsigrok.git] / proto.h

diff --git a/proto.h b/proto.h
index 57c7f2d98130cc3dd0c23a0b4a8864cb1ef5604b..2b5dd6eddf7097d8bd8c93d225d20903cb6ff354 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -45,9 +45,9 @@ SR_API char *sr_log_logdomain_get(void);
 
 /*--- device.c --------------------------------------------------------------*/
 
-SR_API int sr_dev_probe_name_set(const struct sr_dev_inst *sdi,
+SR_API int sr_dev_channel_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,
+SR_API int sr_dev_channel_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,
                const char *trigger);
@@ -59,7 +59,7 @@ SR_API int sr_dev_close(struct sr_dev_inst *sdi);
 
 /*--- filter.c --------------------------------------------------------------*/
 
-SR_API int sr_filter_probes(unsigned int in_unitsize, unsigned int out_unitsize,
+SR_API int sr_filter_channels(unsigned int in_unitsize, unsigned int out_unitsize,
                            const GArray *probe_array, const uint8_t *data_in,
                            uint64_t length_in, uint8_t **data_out,
                            uint64_t *length_out);
@@ -72,14 +72,15 @@ SR_API int sr_driver_init(struct sr_context *ctx,
 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,
                const struct sr_dev_inst *sdi,
-               const struct sr_probe_group *probe_group,
+               const struct sr_channel_group *cg,
                int key, GVariant **data);
 SR_API int sr_config_set(const struct sr_dev_inst *sdi,
-               const struct sr_probe_group *probe_group,
+               const struct sr_channel_group *cg,
                int key, GVariant *data);
+SR_API int sr_config_commit(const struct sr_dev_inst *sdi);
 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,
+               const struct sr_channel_group *cg,
                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);