X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=proto.h;h=54cccb1712c2e6d490c6f441d41bad4ae0bc03a0;hb=898c562fd3b33b07d030ea7f57eb09cd49efe69b;hp=2110368d938cc3812868b060c427201c25ff6219;hpb=4d15e5c9077a543a452a976933286c705c2e7088;p=libsigrok.git diff --git a/proto.h b/proto.h index 2110368d..54cccb17 100644 --- a/proto.h +++ b/proto.h @@ -52,8 +52,6 @@ SR_API int sr_dev_probe_enable(const struct sr_dev_inst *sdi, int probenum, SR_API int sr_dev_trigger_set(const struct sr_dev_inst *sdi, int probenum, const char *trigger); SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key); -SR_API int sr_config_set(const struct sr_dev_inst *sdi, int hwcap, - const void *value); SR_API GSList *sr_dev_inst_list(const struct sr_dev_driver *driver); SR_API int sr_dev_inst_clear(const struct sr_dev_driver *driver); @@ -70,11 +68,12 @@ 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(struct sr_dev_driver *driver, int id, +SR_API int sr_config_get(const struct sr_dev_driver *driver, int key, const void **data, const struct sr_dev_inst *sdi); -SR_API int sr_config_list(struct sr_dev_driver *driver, int id, +SR_API int sr_config_set(const struct sr_dev_inst *sdi, int key, + const void *value); +SR_API int sr_config_list(const struct sr_dev_driver *driver, int key, 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_config_info *sr_config_info_get(int key); SR_API const struct sr_config_info *sr_config_info_name_get(const char *optname); @@ -97,7 +96,6 @@ SR_API int sr_session_datafeed_callback_add(sr_datafeed_callback_t cb); /* Session control */ 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, const struct sr_dev_inst *sdi, unsigned char *buf, int unitsize, int units);