X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session.c;h=6e597ab34dd87065a0fc3bd23e16d2b4c45abb11;hb=b08024a8363c7a019bebc05a25e2689e774326e8;hp=2cafc0f02746846f261d0556f9aad37e35ad3991;hpb=8a2efef2d5900cb3dd935af92a0e22528660c4be;p=libsigrok.git

diff --git a/session.c b/session.c
index 2cafc0f0..6e597ab3 100644
--- a/session.c
+++ b/session.c
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <glib.h>
 #include <sigrok.h>
+#include <sigrok-internal.h>
 
 /* demo.c */
 extern GIOChannel channels[2];
@@ -32,7 +33,7 @@ struct source {
 	int fd;
 	int events;
 	int timeout;
-	receive_data_callback cb;
+	sr_receive_data_callback cb;
 	void *user_data;
 };
 
@@ -81,6 +82,7 @@ int sr_session_device_add(struct sr_device *device)
 	return SR_OK;
 }
 
+#if 0
 void sr_session_pa_clear(void)
 {
 	/*
@@ -91,10 +93,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)
 {
@@ -102,7 +105,7 @@ void sr_session_datafeed_callback_clear(void)
 	session->datafeed_callbacks = NULL;
 }
 
-void sr_session_datafeed_callback_add(datafeed_callback callback)
+void sr_session_datafeed_callback_add(sr_datafeed_callback callback)
 {
 	session->datafeed_callbacks =
 	    g_slist_append(session->datafeed_callbacks, callback);
@@ -156,7 +159,7 @@ int sr_session_start(void)
 	GSList *l;
 	int ret;
 
-	g_message("session: starting");
+	sr_info("session: starting");
 	for (l = session->devices; l; l = l->next) {
 		device = l->data;
 		if ((ret = device->plugin->start_acquisition(
@@ -170,7 +173,7 @@ int sr_session_start(void)
 void sr_session_run(void)
 {
 
-	g_message("session: running");
+	sr_info("session: running");
 	session->running = TRUE;
 
 	/* do we have real sources? */
@@ -187,7 +190,7 @@ void sr_session_run(void)
 void sr_session_halt(void)
 {
 
-	g_message("session: halting");
+	sr_info("session: halting");
 	session->running = FALSE;
 
 }
@@ -197,7 +200,7 @@ void sr_session_stop(void)
 	struct sr_device *device;
 	GSList *l;
 
-	g_message("session: stopping");
+	sr_info("session: stopping");
 	session->running = FALSE;
 	for (l = session->devices; l; l = l->next) {
 		device = l->data;
@@ -210,7 +213,7 @@ void sr_session_stop(void)
 void sr_session_bus(struct sr_device *device, struct sr_datafeed_packet *packet)
 {
 	GSList *l;
-	datafeed_callback cb;
+	sr_datafeed_callback cb;
 
 	/*
 	 * TODO: Send packet through PD pipe, and send the output of that to
@@ -223,7 +226,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;