X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=include%2Flibsigrok%2Fproto.h;h=d75e02376db588a76b9e18bb46bd89544ce7e9b2;hb=7066fd466038bb4a8d09751f8a53c2452c5fefc1;hp=a159baed6c541d0626ac4231053145397ff35a90;hpb=fc74643098877824b7a3cf16cc24de624b191615;p=libsigrok.git diff --git a/include/libsigrok/proto.h b/include/libsigrok/proto.h index a159baed..d75e0237 100644 --- a/include/libsigrok/proto.h +++ b/include/libsigrok/proto.h @@ -64,16 +64,16 @@ 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, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg, - int key, GVariant **data); + uint32_t key, GVariant **data); SR_API int sr_config_set(const struct sr_dev_inst *sdi, const struct sr_channel_group *cg, - int key, GVariant *data); + uint32_t key, GVariant *data); SR_API int sr_config_commit(const struct sr_dev_inst *sdi); SR_API int sr_config_list(const struct sr_dev_driver *driver, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg, - int key, GVariant **data); -SR_API const struct sr_config_info *sr_config_info_get(int key); + 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); /*--- session.c -------------------------------------------------------------*/ @@ -124,7 +124,21 @@ SR_API int sr_session_source_remove_channel(struct sr_session *session, /*--- input/input.c ---------------------------------------------------------*/ -SR_API struct sr_input_format **sr_input_list(void); +SR_API const struct sr_input_module **sr_input_list(void); +SR_API const char *sr_input_id_get(const struct sr_input_module *in); +SR_API const char *sr_input_name_get(const struct sr_input_module *in); +SR_API const char *sr_input_description_get(const struct sr_input_module *in); +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 *in); +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); +SR_API int sr_input_scan_buffer(GString *buf, const struct sr_input **in); +SR_API int sr_input_scan_file(const char *filename, const struct sr_input **in); +SR_API struct sr_dev_inst *sr_input_dev_inst_get(const struct sr_input *in); +SR_API int sr_input_send(const struct sr_input *in, GString *buf); +SR_API int sr_input_end(const struct sr_input *in); +SR_API int sr_input_free(const struct sr_input *in); /*--- output/output.c -------------------------------------------------------*/