input/output formats: s/extension/id/.

[libsigrok.git] / sigrok-proto.h

diff --git a/sigrok-proto.h b/sigrok-proto.h
index e007fd323ff58fcb4b467cad2bf4501ea42c8af4..36c4c6511c4fa0d886244a8a691385a330a31cbb 100644 (file)
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -23,7 +23,7 @@
 /*--- backend.c -------------------------------------------------------------*/
 
 int sr_init(void);
-void sr_exit(void);
+int sr_exit(void);
 
 /*--- datastore.c -----------------------------------------------------------*/
 
@@ -87,15 +87,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 +101,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 +120,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 ---------------------------------------------------------*/