#include <string.h>
#include <glib.h>
#include <sigrok.h>
+#include <sigrok-internal.h>
/* demo.c */
extern GIOChannel channels[2];
int fd;
int events;
int timeout;
- receive_data_callback cb;
+ sr_receive_data_callback cb;
void *user_data;
};
void sr_session_destroy(void)
{
+
g_slist_free(session->devices);
/* TODO: Loop over protocol decoders and free them. */
{
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;
}
return SR_OK;
}
+#if 0
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)
{
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);
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(
void sr_session_run(void)
{
- g_message("session: running");
+ sr_info("session: running");
session->running = TRUE;
/* do we have real sources? */
void sr_session_halt(void)
{
- g_message("session: halting");
+ sr_info("session: halting");
session->running = FALSE;
}
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;
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
}
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;