X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=include%2Flibsigrok%2Fproto.h;h=0892b99e096877569e940b62f30d10040c77eab6;hb=7c198f968b8145321e3b7066c2a549b028a6320b;hp=3d07694d5f140b009842566d1f0ffb4c8eb897c8;hpb=032da34b786333a1af811235c5cf29855479f0b6;p=libsigrok.git diff --git a/include/libsigrok/proto.h b/include/libsigrok/proto.h index 3d07694d..0892b99e 100644 --- a/include/libsigrok/proto.h +++ b/include/libsigrok/proto.h @@ -33,7 +33,7 @@ SR_API int sr_analog_to_float(const struct sr_datafeed_analog2 *analog, SR_API int sr_analog_float_to_string(float value, int digits, char **result); SR_API int sr_analog_unit_to_string(const struct sr_datafeed_analog2 *analog, char **result); -SR_API void sr_rational_set(struct sr_rational *r, uint64_t p, uint64_t q); +SR_API void sr_rational_set(struct sr_rational *r, int64_t p, uint64_t q); /*--- backend.c -------------------------------------------------------------*/ @@ -49,8 +49,6 @@ SR_API int sr_log_loglevel_set(int loglevel); SR_API int sr_log_loglevel_get(void); SR_API int sr_log_callback_set(sr_log_callback cb, void *cb_data); SR_API int sr_log_callback_set_default(void); -SR_API int sr_log_logdomain_set(const char *logdomain); -SR_API char *sr_log_logdomain_get(void); /*--- device.c --------------------------------------------------------------*/ @@ -95,8 +93,8 @@ SR_API int sr_config_list(const struct sr_dev_driver *driver, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg, uint32_t key, GVariant **data); -SR_API const struct sr_config_info *sr_config_info_get(uint32_t key); -SR_API const struct sr_config_info *sr_config_info_name_get(const char *optname); +SR_API const struct sr_key_info *sr_key_info_get(int keytype, uint32_t key); +SR_API const struct sr_key_info *sr_key_info_name_get(int keytype, const char *keyid); /*--- session.c -------------------------------------------------------------*/ @@ -155,6 +153,8 @@ SR_API const char *const *sr_input_extensions_get( const struct sr_input_module *imod); SR_API const struct sr_input_module *sr_input_find(char *id); SR_API const struct sr_option **sr_input_options_get(const struct sr_input_module *imod); +SR_API gboolean sr_output_test_flag(const struct sr_output_module *omod, + uint64_t flag); SR_API void sr_input_options_free(const struct sr_option **options); SR_API struct sr_input *sr_input_new(const struct sr_input_module *imod, GHashTable *options); @@ -177,7 +177,8 @@ SR_API const struct sr_output_module *sr_output_find(char *id); SR_API const struct sr_option **sr_output_options_get(const struct sr_output_module *omod); SR_API void sr_output_options_free(const struct sr_option **opts); SR_API const struct sr_output *sr_output_new(const struct sr_output_module *omod, - GHashTable *params, const struct sr_dev_inst *sdi); + GHashTable *params, const struct sr_dev_inst *sdi, + const char *filename); SR_API int sr_output_send(const struct sr_output *o, const struct sr_datafeed_packet *packet, GString **out); SR_API int sr_output_free(const struct sr_output *o);