manson-hcs-3xxx: Use maximum voltage and current read from device.

[libsigrok.git] / session.c

diff --git a/session.c b/session.c
index 263185c186c0ac058e4e499da32600ffeb081603..ed31bbe62ec70e9bc7eee9d6b35a7dff5731a2f6 100644 (file)
--- a/session.c
+++ b/session.c
@@ -71,6 +71,8 @@ struct sr_session *session;
  *
  * @retval NULL Error.
  * @retval other A pointer to the newly allocated session.
+ *
+ * @since 0.1.0
  */
 SR_API struct sr_session *sr_session_new(void)
 {
@@ -93,6 +95,8 @@ SR_API struct sr_session *sr_session_new(void)
  *
  * @retval SR_OK Success.
  * @retval SR_ERR_BUG No session exists.
+ *
+ * @since 0.1.0
  */
 SR_API int sr_session_destroy(void)
 {
@@ -102,10 +106,9 @@ SR_API int sr_session_destroy(void)
        }
 
        sr_session_dev_remove_all();
-
-       /* TODO: Error checks needed? */
-
        g_mutex_clear(&session->stop_mutex);
+       if (session->trigger)
+               sr_trigger_free(session->trigger);
 
        g_free(session);
        session = NULL;
@@ -121,6 +124,8 @@ SR_API int sr_session_destroy(void)
  *
  * @retval SR_OK Success.
  * @retval SR_ERR_BUG No session exists.
+ *
+ * @since 0.1.0
  */
 SR_API int sr_session_dev_remove_all(void)
 {
@@ -145,6 +150,8 @@ SR_API int sr_session_dev_remove_all(void)
  * @retval SR_OK Success.
  * @retval SR_ERR_ARG Invalid argument.
  * @retval SR_ERR_BUG No session exists.
+ *
+ * @since 0.2.0
  */
 SR_API int sr_session_dev_add(const struct sr_dev_inst *sdi)
 {
@@ -209,6 +216,8 @@ SR_API int sr_session_dev_add(const struct sr_dev_inst *sdi)
  *
  * @retval SR_OK Success.
  * @retval SR_ERR Invalid argument.
+ *
+ * @since 0.3.0
  */
 SR_API int sr_session_dev_list(GSList **devlist)
 {
@@ -228,6 +237,8 @@ SR_API int sr_session_dev_list(GSList **devlist)
  *
  * @retval SR_OK Success.
  * @retval SR_ERR_BUG No session exists.
+ *
+ * @since 0.1.0
  */
 SR_API int sr_session_datafeed_callback_remove_all(void)
 {
@@ -251,6 +262,8 @@ SR_API int sr_session_datafeed_callback_remove_all(void)
  *
  * @retval SR_OK Success.
  * @retval SR_ERR_BUG No session exists.
+ *
+ * @since 0.3.0
  */
 SR_API int sr_session_datafeed_callback_add(sr_datafeed_callback cb, void *cb_data)
 {
@@ -278,6 +291,18 @@ SR_API int sr_session_datafeed_callback_add(sr_datafeed_callback cb, void *cb_da
        return SR_OK;
 }
 
+SR_API struct sr_trigger *sr_session_trigger_get(void)
+{
+       return session->trigger;
+}
+
+SR_API int sr_session_trigger_set(struct sr_trigger *trig)
+{
+       session->trigger = trig;
+
+       return SR_OK;
+}
+
 /**
  * Call every device in the session's callback.
  *
@@ -333,6 +358,42 @@ static int sr_session_iteration(gboolean block)
        return SR_OK;
 }
 
+
+static int verify_trigger(struct sr_trigger *trigger)
+{
+       struct sr_trigger_stage *stage;
+       struct sr_trigger_match *match;
+       GSList *l, *m;
+
+       if (!trigger->stages) {
+               sr_err("No trigger stages defined.");
+               return SR_ERR;
+       }
+
+       sr_spew("Checking trigger:");
+       for (l = trigger->stages; l; l = l->next) {
+               stage = l->data;
+               if (!stage->matches) {
+                       sr_err("Stage %d has no matches defined.", stage->stage);
+                       return SR_ERR;
+               }
+               for (m = stage->matches; m; m = m->next) {
+                       match = m->data;
+                       if (!match->channel) {
+                               sr_err("Stage %d match has no channel.", stage->stage);
+                               return SR_ERR;
+                       }
+                       if (!match->match) {
+                               sr_err("Stage %d match is not defined.", stage->stage);
+                               return SR_ERR;
+                       }
+                       sr_spew("Stage %d match on channel %s, match %d", stage->stage,
+                                       match->channel->name, match->match);
+               }
+       }
+
+       return SR_OK;
+}
 /**
  * Start a session.
  *
@@ -340,6 +401,8 @@ static int sr_session_iteration(gboolean block)
  *
  * @retval SR_OK Success.
  * @retval SR_ERR Error occured.
+ *
+ * @since 0.1.0
  */
 SR_API int sr_session_start(void)
 {
@@ -359,6 +422,9 @@ SR_API int sr_session_start(void)
                return SR_ERR_BUG;
        }
 
+       if (session->trigger && verify_trigger(session->trigger) != SR_OK)
+               return SR_ERR;
+
        sr_info("Starting.");
 
        ret = SR_OK;
@@ -386,6 +452,8 @@ SR_API int sr_session_start(void)
  *
  * @retval SR_OK Success.
  * @retval SR_ERR_BUG Error occured.
+ *
+ * @since 0.1.0
  */
 SR_API int sr_session_run(void)
 {
@@ -470,6 +538,8 @@ SR_PRIV int sr_session_stop_sync(void)
  *
  * @retval SR_OK Success.
  * @retval SR_ERR_BUG No session exists.
+ *
+ * @since 0.1.0
  */
 SR_API int sr_session_stop(void)
 {
@@ -638,6 +708,8 @@ static int _sr_session_source_add(GPollFD *pollfd, int timeout,
  * @retval SR_OK Success.
  * @retval SR_ERR_ARG Invalid argument.
  * @retval SR_ERR_MALLOC Memory allocation error.
+ *
+ * @since 0.3.0
  */
 SR_API int sr_session_source_add(int fd, int events, int timeout,
                sr_receive_data_callback cb, void *cb_data)
@@ -661,6 +733,8 @@ SR_API int sr_session_source_add(int fd, int events, int timeout,
  * @retval SR_OK Success.
  * @retval SR_ERR_ARG Invalid argument.
  * @retval SR_ERR_MALLOC Memory allocation error.
+ *
+ * @since 0.3.0
  */
 SR_API int sr_session_source_add_pollfd(GPollFD *pollfd, int timeout,
                sr_receive_data_callback cb, void *cb_data)
@@ -681,6 +755,8 @@ SR_API int sr_session_source_add_pollfd(GPollFD *pollfd, int timeout,
  * @retval SR_OK Success.
  * @retval SR_ERR_ARG Invalid argument.
  * @retval SR_ERR_MALLOC Memory allocation error.
+ *
+ * @since 0.3.0
  */
 SR_API int sr_session_source_add_channel(GIOChannel *channel, int events,
                int timeout, sr_receive_data_callback cb, void *cb_data)
@@ -765,6 +841,8 @@ static int _sr_session_source_remove(gintptr poll_object)
  * @retval SR_ERR_ARG Invalid argument
  * @retval SR_ERR_MALLOC Memory allocation error.
  * @retval SR_ERR_BUG Internal error.
+ *
+ * @since 0.3.0
  */
 SR_API int sr_session_source_remove(int fd)
 {
@@ -779,6 +857,8 @@ SR_API int sr_session_source_remove(int fd)
  * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
  *         SR_ERR_MALLOC upon memory allocation errors, SR_ERR_BUG upon
  *         internal errors.
+ *
+ * @since 0.2.0
  */
 SR_API int sr_session_source_remove_pollfd(GPollFD *pollfd)
 {
@@ -794,6 +874,8 @@ SR_API int sr_session_source_remove_pollfd(GPollFD *pollfd)
  * @retval SR_ERR_ARG Invalid argument.
  * @retval SR_ERR_MALLOC Memory allocation error.
  * @return SR_ERR_BUG Internal error.
+ *
+ * @since 0.2.0
  */
 SR_API int sr_session_source_remove_channel(GIOChannel *channel)
 {