Various #include file cosmetic fixes.

[sigrok-cli.git] / parsers.c

diff --git a/parsers.c b/parsers.c
index ad5f37925f7d0e156e9158e0865f813c2de6d70d..f7d03bc6bbf230d9af2247b11ecf1fd43755e27d 100644 (file)
--- a/parsers.c
+++ b/parsers.c
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
+#include "sigrok-cli.h"
 
 extern struct sr_context *sr_ctx;
 
@@ -45,13 +45,15 @@ struct sr_channel *find_channel(GSList *channellist, const char *channelname)
 GSList *parse_channelstring(struct sr_dev_inst *sdi, const char *channelstring)
 {
        struct sr_channel *ch;
-       GSList *channellist;
+       GSList *channellist, *channels;
        int ret, n, b, e, i;
        char **tokens, **range, **names, *eptr, str[8];
 
+       channels = sr_dev_inst_channels_get(sdi);
+
        if (!channelstring || !channelstring[0])
                /* Use all channels by default. */
-               return g_slist_copy(sdi->channels);
+               return g_slist_copy(channels);
 
        ret = SR_OK;
        range = NULL;
@@ -65,10 +67,12 @@ GSList *parse_channelstring(struct sr_dev_inst *sdi, const char *channelstring)
                        break;
                }
                if (strchr(tokens[i], '-')) {
-                       /* A range of channels in the form a-b. This will only work
+                       /*
+                        * A range of channels in the form a-b. This will only work
                         * if the channels are named as numbers -- so every channel
                         * in the range must exist as a channel name string in the
-                        * device. */
+                        * device.
+                        */
                        range = g_strsplit(tokens[i], "-", 2);
                        if (!range[0] || !range[1] || range[2]) {
                                /* Need exactly two arguments. */
@@ -102,7 +106,7 @@ GSList *parse_channelstring(struct sr_dev_inst *sdi, const char *channelstring)
                                        ret = SR_ERR;
                                        break;
                                }
-                               ch = find_channel(sdi->channels, str);
+                               ch = find_channel(channels, str);
                                if (!ch) {
                                        g_critical("unknown channel '%d'.", b);
                                        ret = SR_ERR;
@@ -127,7 +131,7 @@ range_fail:
                                break;
                        }
 
-                       ch = find_channel(sdi->channels, names[0]);
+                       ch = find_channel(channels, names[0]);
                        if (!ch) {
                                g_critical("unknown channel '%s'.", names[0]);
                                g_strfreev(names);
@@ -185,7 +189,7 @@ int parse_triggerstring(const struct sr_dev_inst *sdi, const char *s,
        struct sr_channel *ch;
        struct sr_trigger_stage *stage;
        GVariant *gvar;
-       GSList *l;
+       GSList *l, *channels;
        gsize num_matches;
        gboolean found_match, error;
        const int32_t *matches;
@@ -193,8 +197,12 @@ int parse_triggerstring(const struct sr_dev_inst *sdi, const char *s,
        unsigned int j;
        int t, i;
        char **tokens, *sep;
+       struct sr_dev_driver *driver;
+
+       driver = sr_dev_inst_driver_get(sdi);
+       channels = sr_dev_inst_channels_get(sdi);
 
-       if (sr_config_list(sdi->driver, sdi, NULL, SR_CONF_TRIGGER_MATCH,
+       if (maybe_config_list(driver, sdi, NULL, SR_CONF_TRIGGER_MATCH,
                        &gvar) != SR_OK) {
                g_critical("Device doesn't support any triggers.");
                return FALSE;
@@ -212,7 +220,7 @@ int parse_triggerstring(const struct sr_dev_inst *sdi, const char *s,
                }
                *sep++ = 0;
                ch = NULL;
-               for (l = sdi->channels; l; l = l->next) {
+               for (l = channels; l; l = l->next) {
                        ch = l->data;
                        if (ch->enabled && !strcmp(ch->name, tokens[i]))
                                break;
@@ -441,4 +449,3 @@ int parse_driver(char *arg, struct sr_dev_driver **driver, GSList **drvopts)
 
        return TRUE;
 }
-