BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

When adding a device instance to a running session, start acquisition on it

This commit is contained in:
Bert Vermeulen 2013-09-21 17:44:49 +02:00
parent f438e0c923
commit 5451816fd1
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libsigrok.h
View File

@ -830,6 +830,7 @@ struct sr_session {
/** List of struct datafeed_callback pointers. */ /** List of struct datafeed_callback pointers. */
GSList *datafeed_callbacks; GSList *datafeed_callbacks;
GTimeVal starttime; GTimeVal starttime;
gboolean running;
unsigned int num_sources; unsigned int num_sources;

13
session.c
View File

@ -84,6 +84,7 @@ SR_API struct sr_session *sr_session_new(void)
} }
session->source_timeout = -1; session->source_timeout = -1;
session->running = FALSE;
session->abort_session = FALSE; session->abort_session = FALSE;
g_mutex_init(&session->stop_mutex); g_mutex_init(&session->stop_mutex);
@ -148,6 +149,7 @@ SR_API int sr_session_dev_remove_all(void)
*/ */
SR_API int sr_session_dev_add(const struct sr_dev_inst *sdi) SR_API int sr_session_dev_add(const struct sr_dev_inst *sdi)
{ {
int ret;
if (!sdi) { if (!sdi) {
sr_err("%s: sdi was NULL", __func__); sr_err("%s: sdi was NULL", __func__);
@ -176,6 +178,15 @@ SR_API int sr_session_dev_add(const struct sr_dev_inst *sdi)
session->devs = g_slist_append(session->devs, (gpointer)sdi); session->devs = g_slist_append(session->devs, (gpointer)sdi);
if (session->running) {
/* Adding a device to a running session. Start acquisition
* on that device now. */
if ((ret = sdi->driver->dev_acquisition_start(sdi,
(void *)sdi)) != SR_OK)
sr_err("Failed to start acquisition of device in "
"running session: %d", ret);
}
return SR_OK; return SR_OK;
} }
@ -372,6 +383,7 @@ SR_API int sr_session_run(void)
"cannot be run without devices.", __func__); "cannot be run without devices.", __func__);
return SR_ERR_BUG; return SR_ERR_BUG;
} }
session->running = TRUE;
sr_info("Running."); sr_info("Running.");
@ -419,6 +431,7 @@ SR_PRIV int sr_session_stop_sync(void)
sdi->driver->dev_acquisition_stop(sdi, sdi); sdi->driver->dev_acquisition_stop(sdi, sdi);
} }
} }
session->running = FALSE;
return SR_OK; return SR_OK;
} }