X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=include%2Flibsigrok%2Fproto.h;h=05e788646d640482f5a656b0f4a3c0c619d4cf9d;hb=e06875b2ce47e128922d63f09ca4e9b3d8105722;hp=ea9d477946fd7ae74a963f77e1dc89dd3c906a0e;hpb=f014a8fd4cbea56c3ecd23a5b2cbb7c38d905253;p=libsigrok.git diff --git a/include/libsigrok/proto.h b/include/libsigrok/proto.h index ea9d4779..05e78864 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 * @@ -32,9 +30,16 @@ SR_API int sr_analog_to_float(const struct sr_datafeed_analog *analog, float *buf); +SR_API const char *sr_analog_si_prefix(float *value, int *digits); +SR_API gboolean sr_analog_si_prefix_friendly(enum sr_unit unit); SR_API int sr_analog_unit_to_string(const struct sr_datafeed_analog *analog, char **result); SR_API void sr_rational_set(struct sr_rational *r, int64_t p, uint64_t q); +SR_API int sr_rational_eq(const struct sr_rational *a, const struct sr_rational *b); +SR_API int sr_rational_mult(struct sr_rational *res, const struct sr_rational *a, + const struct sr_rational *b); +SR_API int sr_rational_div(struct sr_rational *res, const struct sr_rational *num, + const struct sr_rational *div); /*--- backend.c -------------------------------------------------------------*/ @@ -156,6 +161,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 +214,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, @@ -227,6 +233,7 @@ 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_parse_rational(const char *str, struct sr_rational *ret); /*--- version.c -------------------------------------------------------------*/