X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=proto.h;h=5b516eca113c69904b89ab57894e876363af6583;hb=f5922adef5a866bd1c292436f1c4bc6b93103aef;hp=821846f223abb66e91fc0e29049245a49572feb6;hpb=efdecf4c0553ce00ea2a6365212f5fe305496fed;p=libsigrok.git diff --git a/proto.h b/proto.h index 821846f2..5b516eca 100644 --- a/proto.h +++ b/proto.h @@ -70,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); @@ -90,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); @@ -102,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, @@ -133,6 +141,10 @@ SR_API uint64_t sr_parse_timestring(const char *timestring); SR_API gboolean sr_parse_boolstring(const char *boolstring); SR_API int sr_parse_period(const char *periodstr, uint64_t *p, uint64_t *q); SR_API int sr_parse_voltage(const char *voltstr, uint64_t *p, uint64_t *q); +SR_API int sr_atol(const char *str, long *ret); +SR_API int sr_atoi(const char *str, int *ret); +SR_API int sr_atod(const char *str, double *ret); +SR_API int sr_atof(const char *str, float *ret); /*--- version.c -------------------------------------------------------------*/