Revert temporary changes for 0.2 release.

[libsigrok.git] / session.c

diff --git a/session.c b/session.c
index 2976ce75b10636be1ead596408ebb9d1e67bd046..811bf1393fdb6f62c5b021f1f5116c89f6b49c49 100644 (file)
--- a/session.c
+++ b/session.c
@@ -32,7 +32,7 @@ struct source {
        int fd;
        int events;
        int timeout;
-       receive_data_callback cb;
+       sr_receive_data_callback cb;
        void *user_data;
 };
 
@@ -81,6 +81,7 @@ int sr_session_device_add(struct sr_device *device)
        return SR_OK;
 }
 
+#if 0
 void sr_session_pa_clear(void)
 {
        /*
@@ -91,10 +92,11 @@ void sr_session_pa_clear(void)
        session->analyzers = NULL;
 }
 
-void sr_session_pa_add(struct analyzer *an)
+void sr_session_pa_add(struct sr_analyzer *an)
 {
        session->analyzers = g_slist_append(session->analyzers, an);
 }
+#endif
 
 void sr_session_datafeed_callback_clear(void)
 {
@@ -223,7 +225,7 @@ void sr_session_bus(struct sr_device *device, struct sr_datafeed_packet *packet)
 }
 
 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)
 {
        struct source *new_sources, *s;