X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session.c;h=549666375ad5923e5889de906740f10ce7880daa;hb=0e3b143994797cd4685526b9a739089fe83385cf;hp=ed86de3c8b27b4cb073e40b3de3dcee6c44ba5c3;hpb=b8c2f85f561a3e2738b621a0d42e0c066c1fcee9;p=libsigrok.git
diff --git a/session.c b/session.c
index ed86de3c..54966637 100644
--- a/session.c
+++ b/session.c
@@ -17,13 +17,14 @@
* along with this program. If not, see .
*/
+#include "config.h"
#include
#include
#include
#include
#include
#include
-#include
+#include
/* demo.c */
extern GIOChannel channels[2];
@@ -32,27 +33,28 @@ 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);
/* TODO: Loop over protocol decoders and free them. */
@@ -60,18 +62,18 @@ 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;
- if (device->plugin && device->plugin->open) {
- ret = device->plugin->open(device->plugin_index);
+ if (device->plugin && device->plugin->opendev) {
+ ret = device->plugin->opendev(device->plugin_index);
if (ret != SR_OK)
return ret;
}
@@ -81,7 +83,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 +94,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;
@@ -141,8 +145,9 @@ static void session_run_poll()
* or if the poll timeout out and this source
* asked for that timeout.
*/
- sources[i].cb(fds[i].fd, fds[i].revents,
- sources[i].user_data);
+ if (!sources[i].cb(fds[i].fd, fds[i].revents,
+ sources[i].user_data))
+ sr_session_source_remove(sources[i].fd);
}
}
}
@@ -150,13 +155,13 @@ static void session_run_poll()
}
-int session_start(void)
+int sr_session_start(void)
{
struct sr_device *device;
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(
@@ -167,10 +172,10 @@ int session_start(void)
return ret;
}
-void session_run(void)
+void sr_session_run(void)
{
- g_message("session: running");
+ sr_info("session: running");
session->running = TRUE;
/* do we have real sources? */
@@ -180,24 +185,24 @@ 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");
+ sr_info("session: halting");
session->running = FALSE;
}
-void session_stop(void)
+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;
@@ -207,10 +212,37 @@ void session_stop(void)
}
-void session_bus(struct sr_device *device, struct sr_datafeed_packet *packet)
+static void datafeed_dump(struct sr_datafeed_packet *packet)
+{
+ struct sr_datafeed_logic *logic;
+
+ switch (packet->type) {
+ case SR_DF_HEADER:
+ sr_dbg("bus: received SR_DF_HEADER");
+ break;
+ case SR_DF_TRIGGER:
+ sr_dbg("bus: received SR_DF_TRIGGER at %lu ms",
+ packet->timeoffset / 1000000);
+ break;
+ case SR_DF_LOGIC:
+ logic = packet->payload;
+ sr_dbg("bus: received SR_DF_LOGIC at %f ms duration %f ms, %"PRIu64" bytes",
+ packet->timeoffset / 1000000.0, packet->duration / 1000000.0,
+ logic->length);
+ break;
+ case SR_DF_END:
+ sr_dbg("bus: received SR_DF_END");
+ break;
+ default:
+ sr_dbg("bus: received unknown packet type %d", packet->type);
+ }
+
+}
+
+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
@@ -218,12 +250,13 @@ void session_bus(struct sr_device *device, struct sr_datafeed_packet *packet)
*/
for (l = session->datafeed_callbacks; l; l = l->next) {
cb = l->data;
+ datafeed_dump(packet);
cb(device, 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 +281,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;
@@ -257,7 +290,7 @@ void session_source_remove(int fd)
return;
new_sources = calloc(1, sizeof(struct source) * num_sources);
- for (old = 0; old < num_sources; old++)
+ for (old = 0, new = 0; old < num_sources; old++)
if (sources[old].fd != fd)
memcpy(&new_sources[new++], &sources[old],
sizeof(struct source));