X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=include%2Flibsigrok%2Fproto.h;h=afc89dbc2385a201af1c6390a949dde59e93f047;hb=5de0fc55a6ac8da084caf427f6131482a40855dc;hp=1aa2ee7649d9cb7433c5218f25fbb2eec39245f4;hpb=3cd4b381744eb88fd4ba32565bd408c33b431629;p=libsigrok.git

diff --git a/include/libsigrok/proto.h b/include/libsigrok/proto.h
index 1aa2ee76..afc89dbc 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 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 -------------------------------------------------------------*/
 
@@ -49,8 +49,6 @@ SR_API int sr_log_loglevel_set(int loglevel);
 SR_API int sr_log_loglevel_get(void);
 SR_API int sr_log_callback_set(sr_log_callback cb, void *cb_data);
 SR_API int sr_log_callback_set_default(void);
-SR_API int sr_log_logdomain_set(const char *logdomain);
-SR_API char *sr_log_logdomain_get(void);
 
 /*--- device.c --------------------------------------------------------------*/
 
@@ -95,13 +93,15 @@ SR_API int sr_config_list(const struct sr_dev_driver *driver,
 		const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg,
 		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);
+SR_API const struct sr_key_info *sr_key_info_get(int keytype, uint32_t key);
+SR_API const struct sr_key_info *sr_key_info_name_get(int keytype, const char *keyid);
 
 /*--- session.c -------------------------------------------------------------*/
 
+typedef void (*sr_session_stopped_callback)(void *data);
 typedef void (*sr_datafeed_callback)(const struct sr_dev_inst *sdi,
 		const struct sr_datafeed_packet *packet, void *cb_data);
+
 SR_API struct sr_trigger *sr_session_trigger_get(struct sr_session *session);
 
 /* Session setup */
@@ -124,13 +124,10 @@ 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_is_running(struct sr_session *session);
+SR_API int sr_session_stopped_callback_set(struct sr_session *session,
+		sr_session_stopped_callback cb, void *cb_data);
+
 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,
@@ -211,6 +208,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);