Various #include file cosmetic fixes.

[sigrok-cli.git] / session.c

diff --git a/session.c b/session.c
index 2c2f478365469effabd1c3513c2ef76de606127c..30e08252fe6543b94a266fe92b708332bfe01f17 100644 (file)
--- a/session.c
+++ b/session.c
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include "sigrok-cli.h"
 
 static uint64_t limit_samples = 0;
 static uint64_t limit_frames = 0;
@@ -115,6 +115,37 @@ const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
        return o;
 }
 
+const struct sr_transform *setup_transform_module(const struct sr_dev_inst *sdi)
+{
+       const struct sr_transform_module *tmod;
+       const struct sr_option **options;
+       const struct sr_transform *t;
+       GHashTable *fmtargs, *fmtopts;
+       char *fmtspec;
+
+       if (!opt_transform_module)
+               opt_transform_module = "nop";
+
+       fmtargs = parse_generic_arg(opt_transform_module, TRUE);
+       fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
+       if (!fmtspec)
+               g_critical("Invalid transform module.");
+       if (!(tmod = sr_transform_find(fmtspec)))
+               g_critical("Unknown transform module '%s'.", fmtspec);
+       g_hash_table_remove(fmtargs, "sigrok_key");
+       if ((options = sr_transform_options_get(tmod))) {
+               fmtopts = generic_arg_to_opt(options, fmtargs);
+               sr_transform_options_free(options);
+       } else
+               fmtopts = NULL;
+       t = sr_transform_new(tmod, fmtopts, sdi);
+       if (fmtopts)
+               g_hash_table_destroy(fmtopts);
+       g_hash_table_destroy(fmtargs);
+
+       return t;
+}
+
 void datafeed_in(const struct sr_dev_inst *sdi,
                const struct sr_datafeed_packet *packet, void *cb_data)
 {
@@ -277,8 +308,10 @@ void datafeed_in(const struct sr_dev_inst *sdi,
                        if (!out || (out->len == 0
                                        && !opt_output_format
                                        && packet->type == SR_DF_ANALOG)) {
-                               /* The user didn't specify an output module,
-                                * but needs to see this analog data. */
+                               /*
+                                * The user didn't specify an output module,
+                                * but needs to see this analog data.
+                                */
                                sr_output_send(oa, packet, &out);
                        }
                        if (out && out->len > 0) {
@@ -290,8 +323,10 @@ void datafeed_in(const struct sr_dev_inst *sdi,
                }
        }
 
-       /* SR_DF_END needs to be handled after the output module's receive()
-        * is called, so it can properly clean up that module. */
+       /*
+        * SR_DF_END needs to be handled after the output module's receive()
+        * is called, so it can properly clean up that module.
+        */
        if (packet->type == SR_DF_END) {
                g_debug("cli: Received SR_DF_END.");
 
@@ -447,7 +482,8 @@ int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args)
                cg = select_channel_group(sdi);
                if ((ret = maybe_config_set(sr_dev_inst_driver_get(sdi), sdi, cg,
                                src.key, src.data)) != SR_OK) {
-                       g_critical("Failed to set device option '%s'.", (char *)key);
+                       g_critical("Failed to set device option '%s': %s.",
+                                  (char *)key, sr_strerror(ret));
                        return ret;
                }
        }
@@ -468,6 +504,7 @@ void run_session(void)
        const uint32_t *dev_opts;
        int is_demo_dev;
        struct sr_dev_driver *driver;
+       const struct sr_transform *t;
 
        devices = device_scan();
        if (!devices) {
@@ -516,7 +553,7 @@ void run_session(void)
        g_slist_free(devices);
        g_slist_free(real_devices);
 
-       sr_session_new(&session);
+       sr_session_new(sr_ctx, &session);
        sr_session_datafeed_callback_add(session, datafeed_in, NULL);
 
        if (sr_dev_open(sdi) != SR_OK) {
@@ -578,8 +615,10 @@ void run_session(void)
                }
                if (maybe_config_list(driver, sdi, NULL, SR_CONF_LIMIT_SAMPLES,
                                &gvar) == SR_OK) {
-                       /* The device has no compression, or compression is turned
-                        * off, and publishes its sample memory size. */
+                       /*
+                        * The device has no compression, or compression is turned
+                        * off, and publishes its sample memory size.
+                        */
                        g_variant_get(gvar, "(tt)", &min_samples, &max_samples);
                        g_variant_unref(gvar);
                        if (limit_samples < min_samples) {
@@ -613,6 +652,9 @@ void run_session(void)
                }
        }
 
+       if (!(t = setup_transform_module(sdi)))
+               g_critical("Failed to initialize transform module.");
+
        if (sr_session_start(session) != SR_OK) {
                g_critical("Failed to start session.");
                sr_session_destroy(session);
@@ -631,4 +673,3 @@ void run_session(void)
        sr_session_destroy(session);
 
 }
-