X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=session.c;h=811bf1393fdb6f62c5b021f1f5116c89f6b49c49;hb=8703f512a7c0e05f5fc3a5bc36f9e81afee71da3;hp=ed86de3c8b27b4cb073e40b3de3dcee6c44ba5c3;hpb=b8c2f85f561a3e2738b621a0d42e0c066c1fcee9;p=libsigrok.git
diff --git a/session.c b/session.c
index ed86de3c..811bf139 100644
--- a/session.c
+++ b/session.c
@@ -17,13 +17,13 @@
* along with this program. If not, see .
*/
+#include "config.h"
#include
#include
#include
#include
#include
#include
-#include
/* demo.c */
extern GIOChannel channels[2];
@@ -32,26 +32,26 @@ struct source {
int fd;
int events;
int timeout;
- receive_data_callback cb;
+ sr_receive_data_callback cb;
void *user_data;
};
/* There can only be one session at a time. */
-struct session *session;
+struct sr_session *session;
int num_sources = 0;
struct source *sources = NULL;
int source_timeout = -1;
-struct session *session_new(void)
+struct sr_session *sr_session_new(void)
{
- session = calloc(1, sizeof(struct session));
+ session = calloc(1, sizeof(struct sr_session));
return session;
}
-void session_destroy(void)
+void sr_session_destroy(void)
{
g_slist_free(session->devices);
@@ -60,13 +60,13 @@ void session_destroy(void)
g_free(session);
}
-void session_device_clear(void)
+void sr_session_device_clear(void)
{
g_slist_free(session->devices);
session->devices = NULL;
}
-int session_device_add(struct sr_device *device)
+int sr_session_device_add(struct sr_device *device)
{
int ret;
@@ -81,7 +81,8 @@ int session_device_add(struct sr_device *device)
return SR_OK;
}
-void session_pa_clear(void)
+#if 0
+void sr_session_pa_clear(void)
{
/*
* The protocols are pointers to the global set of PA plugins,
@@ -91,24 +92,25 @@ void session_pa_clear(void)
session->analyzers = NULL;
}
-void 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 session_datafeed_callback_clear(void)
+void sr_session_datafeed_callback_clear(void)
{
g_slist_free(session->datafeed_callbacks);
session->datafeed_callbacks = NULL;
}
-void 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);
}
-static void session_run_poll()
+static void sr_session_run_poll()
{
GPollFD *fds, my_gpollfd;
int ret, i;
@@ -150,7 +152,7 @@ static void session_run_poll()
}
-int session_start(void)
+int sr_session_start(void)
{
struct sr_device *device;
GSList *l;
@@ -167,7 +169,7 @@ int session_start(void)
return ret;
}
-void session_run(void)
+void sr_session_run(void)
{
g_message("session: running");
@@ -180,11 +182,11 @@ void session_run(void)
sources[0].cb(-1, 0, sources[0].user_data);
else
/* real sources, use g_poll() main loop */
- session_run_poll();
+ sr_session_run_poll();
}
-void session_halt(void)
+void sr_session_halt(void)
{
g_message("session: halting");
@@ -192,7 +194,7 @@ void session_halt(void)
}
-void session_stop(void)
+void sr_session_stop(void)
{
struct sr_device *device;
GSList *l;
@@ -207,10 +209,10 @@ void session_stop(void)
}
-void session_bus(struct sr_device *device, struct sr_datafeed_packet *packet)
+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
@@ -222,8 +224,8 @@ void session_bus(struct sr_device *device, struct sr_datafeed_packet *packet)
}
}
-void session_source_add(int fd, int events, int timeout,
- receive_data_callback callback, void *user_data)
+void sr_session_source_add(int fd, int events, int timeout,
+ sr_receive_data_callback callback, void *user_data)
{
struct source *new_sources, *s;
@@ -248,7 +250,7 @@ void session_source_add(int fd, int events, int timeout,
source_timeout = timeout;
}
-void session_source_remove(int fd)
+void sr_session_source_remove(int fd)
{
struct source *new_sources;
int old, new;