X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=include%2Flibsigrok%2Fproto.h;h=3d07694d5f140b009842566d1f0ffb4c8eb897c8;hb=032da34b786333a1af811235c5cf29855479f0b6;hp=e74f39923e32e404e442ac6a3d39a89e8f6e20a3;hpb=4fb0a5f8a022b4b551f0dcac5c458c7108ea613c;p=libsigrok.git diff --git a/include/libsigrok/proto.h b/include/libsigrok/proto.h index e74f3992..3d07694d 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 inline void sr_rational_set(struct sr_rational *r, uint64_t p, uint64_t q); +SR_API void sr_rational_set(struct sr_rational *r, uint64_t p, uint64_t q); /*--- backend.c -------------------------------------------------------------*/ @@ -54,9 +54,9 @@ SR_API char *sr_log_logdomain_get(void); /*--- device.c --------------------------------------------------------------*/ -SR_API int sr_dev_channel_name_set(const struct sr_dev_inst *sdi, - int channelnum, const char *name); -SR_API int sr_dev_channel_enable(const struct sr_dev_inst *sdi, int channelnum, +SR_API int sr_dev_channel_name_set(struct sr_channel *channel, + const char *name); +SR_API int sr_dev_channel_enable(struct sr_channel *channel, gboolean state); SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key); SR_API GSList *sr_dev_list(const struct sr_dev_driver *driver); @@ -79,7 +79,7 @@ SR_API int sr_dev_inst_channel_add(struct sr_dev_inst *sdi, int index, int type, /*--- hwdriver.c ------------------------------------------------------------*/ -SR_API struct sr_dev_driver **sr_driver_list(void); +SR_API struct sr_dev_driver **sr_driver_list(const struct sr_context *ctx); 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); @@ -105,8 +105,9 @@ typedef void (*sr_datafeed_callback)(const struct sr_dev_inst *sdi, SR_API struct sr_trigger *sr_session_trigger_get(struct sr_session *session); /* Session setup */ -SR_API int sr_session_load(const char *filename, struct sr_session **session); -SR_API int sr_session_new(struct sr_session **session); +SR_API int sr_session_load(struct sr_context *ctx, const char *filename, + struct sr_session **session); +SR_API int sr_session_new(struct sr_context *ctx, struct sr_session **session); SR_API int sr_session_destroy(struct sr_session *session); SR_API int sr_session_dev_remove_all(struct sr_session *session); SR_API int sr_session_dev_add(struct sr_session *session, @@ -181,6 +182,19 @@ 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); +/*--- transform/transform.c -------------------------------------------------*/ + +SR_API const struct sr_transform_module **sr_transform_list(void); +SR_API const char *sr_transform_id_get(const struct sr_transform_module *tmod); +SR_API const char *sr_transform_name_get(const struct sr_transform_module *tmod); +SR_API const char *sr_transform_description_get(const struct sr_transform_module *tmod); +SR_API const struct sr_transform_module *sr_transform_find(const char *id); +SR_API const struct sr_option **sr_transform_options_get(const struct sr_transform_module *tmod); +SR_API void sr_transform_options_free(const struct sr_option **opts); +SR_API const struct sr_transform *sr_transform_new(const struct sr_transform_module *tmod, + GHashTable *params, const struct sr_dev_inst *sdi); +SR_API int sr_transform_free(const struct sr_transform *t); + /*--- trigger.c -------------------------------------------------------------*/ SR_API struct sr_trigger *sr_trigger_new(const char *name);