Fix output module enumeration + code cleanup.

[sigrok-cli.git] / session.c

diff --git a/session.c b/session.c
index 6465055a1c00f05dc3186066b17728bbca1e819e..d201492b01ed1464cfe85804ea7d1f23715a206c 100644 (file)
--- a/session.c
+++ b/session.c
@@ -71,7 +71,7 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
        return SR_OK;
 }
 

-GHashTable *generic_arg_to_opt(const struct sr_option *opts, GHashTable *genargs)
+GHashTable *generic_arg_to_opt(const struct sr_option **opts, GHashTable *genargs)

 {
        GHashTable *hash;
        GVariant *gvar;
 {
        GHashTable *hash;
        GVariant *gvar;


@@ -80,16 +80,19 @@ GHashTable *generic_arg_to_opt(const struct sr_option *opts, GHashTable *genargs
 
        hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
                        (GDestroyNotify)g_variant_unref);
 
        hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
                        (GDestroyNotify)g_variant_unref);

-       for (opt = opts; opt->id && opt->def; opt++) {
+       for (opt = opts[0]; opt; opt++) {

                if (!(s = g_hash_table_lookup(genargs, opt->id)))
                        continue;
                if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE_UINT32)) {
                        gvar = g_variant_new_uint32(strtoul(s, NULL, 10));
                        g_hash_table_insert(hash, g_strdup(opt->id),
                                        g_variant_ref_sink(gvar));
                if (!(s = g_hash_table_lookup(genargs, opt->id)))
                        continue;
                if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE_UINT32)) {
                        gvar = g_variant_new_uint32(strtoul(s, NULL, 10));
                        g_hash_table_insert(hash, g_strdup(opt->id),
                                        g_variant_ref_sink(gvar));

+               } else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE_DOUBLE)) {
+                       gvar = g_variant_new_double(strtod(s, NULL));
+                       g_hash_table_insert(hash, g_strdup(opt->id),
+                                       g_variant_ref_sink(gvar));

                } else {
                } else {

-                       g_critical("Don't know how to convert option '%s' to %s!",
-                                       opt->id, g_variant_get_type_string(opt->def));
+                       g_critical("Don't know GVariant type for option '%s'!", opt->id);

                 }
        }
 
                 }
        }
 


@@ -99,7 +102,7 @@ GHashTable *generic_arg_to_opt(const struct sr_option *opts, GHashTable *genargs
 const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
 {
        const struct sr_output_module *omod;
 const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
 {
        const struct sr_output_module *omod;

-       const struct sr_option *opts;
+       const struct sr_option **options;

        const struct sr_output *o;
        GHashTable *fmtargs, *fmtopts;
        char *fmtspec;
        const struct sr_output *o;
        GHashTable *fmtargs, *fmtopts;
        char *fmtspec;


@@ -124,11 +127,11 @@ const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
        if (!fmtspec)
                g_critical("Invalid output format.");
        if (!(omod = sr_output_find(fmtspec)))
        if (!fmtspec)
                g_critical("Invalid output format.");
        if (!(omod = sr_output_find(fmtspec)))

-               g_critical("Unknown output format '%s'.", fmtspec);
+               g_critical("Unknown output module '%s'.", fmtspec);

        g_hash_table_remove(fmtargs, "sigrok_key");
        g_hash_table_remove(fmtargs, "sigrok_key");

-       if ((opts = sr_output_options_get(omod))) {
-               fmtopts = generic_arg_to_opt(opts, fmtargs);
-               sr_output_options_free(omod);
+       if ((options = sr_output_options_get(omod))) {
+               fmtopts = generic_arg_to_opt(options, fmtargs);
+               sr_output_options_free(options);

        } else
                fmtopts = NULL;
        o = sr_output_new(omod, fmtopts, sdi);
        } else
                fmtopts = NULL;
        o = sr_output_new(omod, fmtopts, sdi);


@@ -171,7 +174,8 @@ void datafeed_in(const struct sr_dev_inst *sdi,
        switch (packet->type) {
        case SR_DF_HEADER:
                g_debug("cli: Received SR_DF_HEADER.");
        switch (packet->type) {
        case SR_DF_HEADER:
                g_debug("cli: Received SR_DF_HEADER.");

-               o = setup_output_format(sdi);
+               if (!(o = setup_output_format(sdi)))
+                       g_critical("Failed to initialize output module.");

 
                /* Set up backup analog output module. */
                oa = sr_output_new(sr_output_find("analog"), NULL, sdi);
 
                /* Set up backup analog output module. */
                oa = sr_output_new(sr_output_find("analog"), NULL, sdi);