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

sr_session_trigger_{get,set}: Document, add error checks.

This commit is contained in:
Uwe Hermann 2014-11-24 00:50:11 +01:00
parent c8965e5459
commit 9f42e2e6be
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/session.c
View File

@ -316,13 +316,40 @@ SR_API int sr_session_datafeed_callback_add(struct sr_session *session,
return SR_OK; return SR_OK;
} }
/**
* Get the trigger assigned to this session.
*
* @param session The session to use.
*
* @retval NULL Invalid (NULL) session was passed to the function.
* @retval other The trigger assigned to this session (can be NULL).
*
* @since 0.4.0
*/
SR_API struct sr_trigger *sr_session_trigger_get(struct sr_session *session) SR_API struct sr_trigger *sr_session_trigger_get(struct sr_session *session)
{ {
if (!session)
return NULL;
return session->trigger; return session->trigger;
} }
/**
* Set the trigger of this session.
*
* @param session The session to use. Must not be NULL.
* @param trig The trigger to assign to this session. Can be NULL.
*
* @retval SR_OK Success.
* @retval SR_ERR_ARG Invalid argument.
*
* @since 0.4.0
*/
SR_API int sr_session_trigger_set(struct sr_session *session, struct sr_trigger *trig) SR_API int sr_session_trigger_set(struct sr_session *session, struct sr_trigger *trig)
{ {
if (!session)
return SR_ERR_ARG;
session->trigger = trig; session->trigger = trig;
return SR_OK; return SR_OK;
@ -385,7 +412,6 @@ static int sr_session_iteration(struct sr_session *session, gboolean block)
return SR_OK; return SR_OK;
} }
static int verify_trigger(struct sr_trigger *trigger) static int verify_trigger(struct sr_trigger *trigger)
{ {
struct sr_trigger_stage *stage; struct sr_trigger_stage *stage;