X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=sigrok-proto.h;h=fce35c094b249675a849a7ef5f5bb7ce664cd724;hb=5a9660dd4e4977b9c3a86fe895e0b714e64a44a1;hp=3589024d74326d77b0b46fffd19eb5edc6e7feee;hpb=8225e92175c64909eddaecf8bd512049acf653a2;p=libsigrok.git

diff --git a/sigrok-proto.h b/sigrok-proto.h
index 3589024d..fce35c09 100644
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -23,7 +23,12 @@
 /*--- backend.c -------------------------------------------------------------*/
 
 int sr_init(void);
-void sr_exit(void);
+int sr_exit(void);
+
+/*--- log.c -----------------------------------------------------------------*/
+
+int sr_set_loglevel(int loglevel);
+int sr_get_loglevel(void);
 
 /*--- datastore.c -----------------------------------------------------------*/
 
@@ -56,9 +61,9 @@ gboolean sr_device_has_hwcap(struct sr_device *device, int hwcap);
 
 /*--- filter.c --------------------------------------------------------------*/
 
-int filter_probes(int in_unitsize, int out_unitsize, int *probelist,
-		  const char *data_in, uint64_t length_in, char **data_out,
-		  uint64_t *length_out);
+int sr_filter_probes(int in_unitsize, int out_unitsize, int *probelist,
+		     const char *data_in, uint64_t length_in, char **data_out,
+		     uint64_t *length_out);
 
 /*--- hwplugin.c ------------------------------------------------------------*/
 
@@ -87,15 +92,12 @@ int sr_find_hwcap(int *capabilities, int hwcap);
 struct sr_hwcap_option *sr_find_hwcap_option(int hwcap);
 void sr_source_remove(int fd);
 void sr_source_add(int fd, int events, int timeout,
-		   receive_data_callback rcv_cb, void *user_data);
+		   sr_receive_data_callback rcv_cb, void *user_data);
 
 /*--- session.c -------------------------------------------------------------*/
 
-typedef void (*source_callback_remove) (int fd);
-typedef void (*source_callback_add) (int fd, int events, int timeout,
-		receive_data_callback callback, void *user_data);
-typedef void (*datafeed_callback) (struct sr_device *device,
-				 struct sr_datafeed_packet *packet);
+typedef void (*sr_datafeed_callback) (struct sr_device *device,
+				      struct sr_datafeed_packet *packet);
 
 /* Session setup */
 int sr_session_load(const char *filename);
@@ -104,13 +106,15 @@ void sr_session_destroy(void);
 void sr_session_device_clear(void);
 int sr_session_device_add(struct sr_device *device);
 
+#if 0
 /* Protocol analyzers setup */
 void sr_session_pa_clear(void);
-void sr_session_pa_add(struct analyzer *pa);
+void sr_session_pa_add(struct sr_analyzer *pa);
+#endif
 
 /* Datafeed setup */
 void sr_session_datafeed_callback_clear(void);
-void sr_session_datafeed_callback_add(datafeed_callback callback);
+void sr_session_datafeed_callback_add(sr_datafeed_callback callback);
 
 /* Session control */
 int sr_session_start(void);
@@ -121,7 +125,7 @@ void sr_session_bus(struct sr_device *device,
 		    struct sr_datafeed_packet *packet);
 int sr_session_save(const char *filename);
 void sr_session_source_add(int fd, int events, int timeout,
-	        receive_data_callback callback, void *user_data);
+	        sr_receive_data_callback callback, void *user_data);
 void sr_session_source_remove(int fd);
 
 /*--- input/input.c ---------------------------------------------------------*/