X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-proto.h;h=3481c582756b2a3aa18c3a522e27731e7baaee3b;hb=bd47acabe33813acb7dd6a4ebf155418072b08b7;hp=b628f19239715cfb02211bb8347cfd87f5978e08;hpb=1f9813eb6cf2fa3b6511af46b19270feb9484c1e;p=libsigrok.git

diff --git a/sigrok-proto.h b/sigrok-proto.h
index b628f192..3481c582 100644
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -27,13 +27,13 @@ SR_API int sr_exit(void);
 
 /*--- log.c -----------------------------------------------------------------*/
 
-typedef int (*sr_log_handler_t)(void *cb_data, int loglevel, const char *format,
-				va_list args);
+typedef int (*sr_log_callback_t)(void *cb_data, int loglevel,
+				 const char *format, va_list args);
 
 SR_API int sr_log_loglevel_set(int loglevel);
 SR_API int sr_log_loglevel_get(void);
-SR_API int sr_log_handler_set(sr_log_handler_t handler, void *cb_data);
-SR_API int sr_log_handler_set_default(void);
+SR_API int sr_log_callback_set(sr_log_callback_t 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);
 
@@ -43,7 +43,7 @@ SR_API int sr_datastore_new(int unitsize, struct sr_datastore **ds);
 SR_API int sr_datastore_destroy(struct sr_datastore *ds);
 SR_API int sr_datastore_put(struct sr_datastore *ds, void *data,
 			    unsigned int length, int in_unitsize,
-			    int *probelist);
+			    const int *probelist);
 
 /*--- device.c --------------------------------------------------------------*/
 
@@ -56,7 +56,7 @@ SR_API struct sr_probe *sr_dev_probe_find(const struct sr_dev *dev,
 					  int probenum);
 SR_API int sr_dev_probe_name_set(struct sr_dev *dev, int probenum,
 				 const char *name);
-SR_API int sr_dev_trigger_clear(struct sr_dev *dev);
+SR_API int sr_dev_trigger_remove_all(struct sr_dev *dev);
 SR_API int sr_dev_trigger_set(struct sr_dev *dev, int probenum,
 			      const char *trigger);
 SR_API gboolean sr_dev_has_hwcap(const struct sr_dev *dev, int hwcap);
@@ -65,8 +65,8 @@ SR_API int sr_dev_info_get(const struct sr_dev *dev, int id, const void **data);
 /*--- filter.c --------------------------------------------------------------*/
 
 SR_API int sr_filter_probes(int in_unitsize, int out_unitsize,
-			    const int *probelist, const unsigned char *data_in,
-			    uint64_t length_in, char **data_out,
+			    const int *probelist, const uint8_t *data_in,
+			    uint64_t length_in, uint8_t **data_out,
 			    uint64_t *length_out);
 
 /*--- hwdriver.c ------------------------------------------------------------*/
@@ -74,7 +74,7 @@ SR_API int sr_filter_probes(int in_unitsize, int out_unitsize,
 SR_API struct sr_dev_driver **sr_driver_list(void);
 SR_API int sr_driver_init(struct sr_dev_driver *driver);
 SR_API gboolean sr_driver_hwcap_exists(struct sr_dev_driver *driver, int hwcap);
-SR_API struct sr_hwcap_option *sr_hw_hwcap_get(int hwcap);
+SR_API const struct sr_hwcap_option *sr_hw_hwcap_get(int hwcap);
 
 /*--- session.c -------------------------------------------------------------*/
 
@@ -85,11 +85,11 @@ typedef void (*sr_datafeed_callback_t)(struct sr_dev *dev,
 SR_API int sr_session_load(const char *filename);
 SR_API struct sr_session *sr_session_new(void);
 SR_API int sr_session_destroy(void);
-SR_API int sr_session_dev_clear(void);
+SR_API int sr_session_dev_remove_all(void);
 SR_API int sr_session_dev_add(struct sr_dev *dev);
 
 /* Datafeed setup */
-SR_API int sr_session_datafeed_callback_clear(void);
+SR_API int sr_session_datafeed_callback_remove_all(void);
 SR_API int sr_session_datafeed_callback_add(sr_datafeed_callback_t cb);
 
 /* Session control */
@@ -114,10 +114,25 @@ SR_API struct sr_output_format **sr_output_list(void);
 
 SR_API char *sr_samplerate_string(uint64_t samplerate);
 SR_API char *sr_period_string(uint64_t frequency);
+SR_API char *sr_voltage_string(struct sr_rational *voltage);
 SR_API char **sr_parse_triggerstring(struct sr_dev *dev,
 				     const char *triggerstring);
 SR_API int sr_parse_sizestring(const char *sizestring, uint64_t *size);
 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, struct sr_rational *r);
+SR_API int sr_parse_voltage(const char *voltstr, struct sr_rational *r);
+
+/*--- version.c -------------------------------------------------------------*/
+
+SR_API int sr_package_version_major_get(void);
+SR_API int sr_package_version_minor_get(void);
+SR_API int sr_package_version_micro_get(void);
+SR_API const char *sr_package_version_string_get(void);
+
+SR_API int sr_lib_version_current_get(void);
+SR_API int sr_lib_version_revision_get(void);
+SR_API int sr_lib_version_age_get(void);
+SR_API const char *sr_lib_version_string_get(void);
 
 #endif