gmc-mh-1x-2x: Support for interface SI232-II with driver gmc-mh-2x-bd232.

[libsigrok.git] / session.c

diff --git a/session.c b/session.c
index 2725d6e9b7b74d44251ea857b2079f3a641735b0..1a9343fe403dfbd103183588bd1a47655d28d3c7 100644 (file)
--- a/session.c
+++ b/session.c
@@ -25,14 +25,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "session: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "session"
 
 /**
  * @file
@@ -75,7 +68,7 @@ struct sr_session *session;
  *       The same question applies to all the other session functions.
  *
  * @retval NULL Error.
- * @retval other A pointer to the newly allocated session->
+ * @retval other A pointer to the newly allocated session.
  */
 SR_API struct sr_session *sr_session_new(void)
 {
@@ -183,12 +176,20 @@ SR_API int sr_session_dev_add(const struct sr_dev_inst *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. */
+               /* Adding a device to a running session. Commit settings
+                * and start acquisition on that device now. */
+               if ((ret = sr_config_commit(sdi)) != SR_OK) {
+                       sr_err("Failed to commit device settings before "
+                              "starting acquisition in running session (%s)",
+                              sr_strerror(ret));
+                       return ret;
+               }
                if ((ret = sdi->driver->dev_acquisition_start(sdi,
-                                               (void *)sdi)) != SR_OK)
+                                               (void *)sdi)) != SR_OK) {
                        sr_err("Failed to start acquisition of device in "
-                                       "running session: %d", ret);
+                              "running session (%s)", sr_strerror(ret));
+                       return ret;
+               }
        }
 
        return SR_OK;
@@ -361,6 +362,11 @@ SR_API int sr_session_start(void)
        ret = SR_OK;
        for (l = session->devs; l; l = l->next) {
                sdi = l->data;
+               if ((ret = sr_config_commit(sdi)) != SR_OK) {
+                       sr_err("Failed to commit device settings before "
+                              "starting acquisition (%s)", sr_strerror(ret));
+                       break;
+               }
                if ((ret = sdi->driver->dev_acquisition_start(sdi, sdi)) != SR_OK) {
                        sr_err("%s: could not start an acquisition "
                               "(%s)", __func__, sr_strerror(ret));