asix-sigma: Fix the trigger handling

[libsigrok.git] / session.c

diff --git a/session.c b/session.c
index e1fb5cfb2bf00df9e600024365acb16a1a00c8ff..cae9126e4a3aa45e8c78b2ffc2f3f4d99b960dcb 100644 (file)
--- a/session.c
+++ b/session.c
@@ -25,7 +25,9 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
+/** @cond PRIVATE */
 #define LOG_PREFIX "session"
+/** @endcond */
 
 /**
  * @file
@@ -176,12 +178,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;
@@ -354,6 +364,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));
@@ -492,8 +507,8 @@ static void datafeed_dump(const struct sr_datafeed_packet *packet)
                break;
        case SR_DF_LOGIC:
                logic = packet->payload;
-               sr_dbg("bus: Received SR_DF_LOGIC packet (%" PRIu64 " bytes).",
-                      logic->length);
+               sr_dbg("bus: Received SR_DF_LOGIC packet (%" PRIu64 " bytes, "
+                      "unitsize = %d).", logic->length, logic->unitsize);
                break;
        case SR_DF_ANALOG:
                analog = packet->payload;