X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=include%2Flibsigrok%2Fproto.h;h=caa8407e23a19ede70a311b6231c3555236cb47d;hb=510aa8281f19b6312163ff2f09d6515661889378;hp=ea9d477946fd7ae74a963f77e1dc89dd3c906a0e;hpb=f014a8fd4cbea56c3ecd23a5b2cbb7c38d905253;p=libsigrok.git diff --git a/include/libsigrok/proto.h b/include/libsigrok/proto.h index ea9d4779..caa8407e 100644 --- a/include/libsigrok/proto.h +++ b/include/libsigrok/proto.h @@ -20,8 +20,6 @@ #ifndef LIBSIGROK_PROTO_H #define LIBSIGROK_PROTO_H -#include - /** * @file * @@ -156,6 +154,7 @@ 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_reset(const struct sr_input *in); SR_API void sr_input_free(const struct sr_input *in); /*--- output/output.c -------------------------------------------------------*/ @@ -208,7 +207,7 @@ typedef int (*sr_resource_open_callback)(struct sr_resource *res, const char *name, void *cb_data); typedef int (*sr_resource_close_callback)(struct sr_resource *res, void *cb_data); -typedef ssize_t (*sr_resource_read_callback)(const struct sr_resource *res, +typedef gssize (*sr_resource_read_callback)(const struct sr_resource *res, void *buf, size_t count, void *cb_data); SR_API int sr_resource_set_hooks(struct sr_context *ctx,