C++: Wrap resource access API

[libsigrok.git] / include / libsigrok / proto.h

diff --git a/include/libsigrok/proto.h b/include/libsigrok/proto.h
index 19c1680f8d7fc1d14efb59f307842370c4d0e270..e482b309bac0f74d5deaffd94877ce5378ea8bbb 100644 (file)
--- 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 void sr_rational_set(struct sr_rational *r, uint64_t p, uint64_t q);
+SR_API void sr_rational_set(struct sr_rational *r, int64_t p, uint64_t q);
 
 /*--- backend.c -------------------------------------------------------------*/
 
@@ -122,13 +122,6 @@ SR_API int sr_session_datafeed_callback_add(struct sr_session *session,
 SR_API int sr_session_start(struct sr_session *session);
 SR_API int sr_session_run(struct sr_session *session);
 SR_API int sr_session_stop(struct sr_session *session);
-SR_API int sr_session_save(struct sr_session *session, const char *filename,
-               const struct sr_dev_inst *sdi, unsigned char *buf, int unitsize,
-               int units);
-SR_API int sr_session_save_init(struct sr_session *session,
-               const char *filename, uint64_t samplerate, char **channels);
-SR_API int sr_session_append(struct sr_session *session,
-               const char *filename, unsigned char *buf, int unitsize, int units);
 SR_API int sr_session_source_add(struct sr_session *session, int fd,
                int events, int timeout, sr_receive_data_callback cb, void *cb_data);
 SR_API int sr_session_source_add_pollfd(struct sr_session *session,
@@ -209,6 +202,20 @@ SR_API int sr_trigger_match_add(struct sr_trigger_stage *stage,
 SR_API GSList *sr_serial_list(const struct sr_dev_driver *driver);
 SR_API void sr_serial_free(struct sr_serial_port *serial);
 
+/*--- resource.c ------------------------------------------------------------*/
+
+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,
+               void *buf, size_t count, void *cb_data);
+
+SR_API int sr_resource_set_hooks(struct sr_context *ctx,
+               sr_resource_open_callback open_cb,
+               sr_resource_close_callback close_cb,
+               sr_resource_read_callback read_cb, void *cb_data);
+
 /*--- strutil.c -------------------------------------------------------------*/
 
 SR_API char *sr_si_string_u64(uint64_t x, const char *unit);