X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=include%2Flibsigrok%2Fproto.h;h=357512ca0a8103a59204668f86445881964e219f;hb=e3847923a4ddf50349dcf21259cd4a02722c2960;hp=2017f7123de04982b50620182e0871806f052e58;hpb=c83bdde9da1ec1760b5bd7810f41ce992990a00b;p=libsigrok.git diff --git a/include/libsigrok/proto.h b/include/libsigrok/proto.h index 2017f712..357512ca 100644 --- a/include/libsigrok/proto.h +++ b/include/libsigrok/proto.h @@ -67,6 +67,7 @@ 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_callback_get(sr_log_callback *cb, void **cb_data); /*--- device.c --------------------------------------------------------------*/ @@ -153,6 +154,10 @@ SR_API int sr_session_is_running(struct sr_session *session); SR_API int sr_session_stopped_callback_set(struct sr_session *session, sr_session_stopped_callback cb, void *cb_data); +SR_API int sr_packet_copy(const struct sr_datafeed_packet *packet, + struct sr_datafeed_packet **copy); +SR_API void sr_packet_free(struct sr_datafeed_packet *packet); + /*--- input/input.c ---------------------------------------------------------*/ SR_API const struct sr_input_module **sr_input_list(void); @@ -161,10 +166,8 @@ SR_API const char *sr_input_name_get(const struct sr_input_module *imod); SR_API const char *sr_input_description_get(const struct sr_input_module *imod); 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_input_module *sr_input_find(const 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); @@ -191,6 +194,8 @@ 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, const char *filename); +SR_API gboolean sr_output_test_flag(const struct sr_output_module *omod, + uint64_t flag); 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); @@ -248,6 +253,8 @@ 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_sprintf_ascii(char *buf, const char *format, ...); +SR_API int sr_vsprintf_ascii(char *buf, const char *format, va_list args); SR_API int sr_snprintf_ascii(char *buf, size_t buf_size, const char *format, ...); SR_API int sr_vsnprintf_ascii(char *buf, size_t buf_size,