Build: Include <config.h> first in all source files

[sigrok-cli.git] / main.c

diff --git a/main.c b/main.c
index 1d3b33df800f1765f6247a7acafe33c603dd94c0..51053bc9a8a3ed2135622ffd7f841eff8d1d91d7 100644 (file)
--- a/main.c
+++ b/main.c
@@ -17,9 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
+#include <config.h>
 #include <stdlib.h>
 #include <glib.h>
+#include "sigrok-cli.h"
 
 struct sr_context *sr_ctx = NULL;
 #ifdef HAVE_SRD
@@ -50,6 +51,7 @@ static void logger(const gchar *log_domain, GLogLevelFlags log_level,
 int select_channels(struct sr_dev_inst *sdi)
 {
        struct sr_channel *ch;
+       gboolean enabled;
        GSList *selected_channels, *l, *channels;
 
        channels = sr_dev_inst_channels_get(sdi);
@@ -60,10 +62,9 @@ int select_channels(struct sr_dev_inst *sdi)
 
                for (l = channels; l; l = l->next) {
                        ch = l->data;
-                       if (g_slist_find(selected_channels, ch))
-                               ch->enabled = TRUE;
-                       else
-                               ch->enabled = FALSE;
+                       enabled = (g_slist_find(selected_channels, ch) != NULL);
+                       if (sr_dev_channel_enable(ch, enabled) != SR_OK)
+                               return SR_ERR;
                }
                g_slist_free(selected_channels);
        }
@@ -80,22 +81,26 @@ gboolean config_key_has_cap(struct sr_dev_driver *driver,
        GVariant *gvar_opts;
        const uint32_t *opts;
        gsize num_opts, i;
+       gboolean result;
 
        if (sr_config_list(driver, sdi, cg, SR_CONF_DEVICE_OPTIONS,
                        &gvar_opts) != SR_OK)
                return FALSE;
 
        opts = g_variant_get_fixed_array(gvar_opts, &num_opts, sizeof(uint32_t));
+       result = FALSE;
        for (i = 0; i < num_opts; i++) {
                if ((opts[i] & SR_CONF_MASK) == key) {
                        if ((opts[i] & capability) == capability)
-                               return TRUE;
+                               result = TRUE;
                        else
-                               return FALSE;
+                               result = FALSE;
+                       break;
                }
        }
+       g_variant_unref(gvar_opts);
 
-       return FALSE;
+       return result;
 }
 
 int maybe_config_get(struct sr_dev_driver *driver,
@@ -132,7 +137,7 @@ static void get_option(void)
 {
        struct sr_dev_inst *sdi;
        struct sr_channel_group *cg;
-       const struct sr_config_info *ci;
+       const struct sr_key_info *ci;
        GSList *devices;
        GVariant *gvar;
        GHashTable *devargs;
@@ -155,7 +160,7 @@ static void get_option(void)
        }
 
        cg = select_channel_group(sdi);
-       if (!(ci = sr_config_info_name_get(opt_get)))
+       if (!(ci = sr_key_info_name_get(SR_KEY_CONFIG, opt_get)))
                g_critical("Unknown option '%s'", opt_get);
 
        if ((devargs = parse_generic_arg(opt_config, FALSE)))