Corrected a comment typo

[sigrok-cli.git] / sigrok-cli.c

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 4af47d2da2a3fe0470fee124af052e62fbcff140..bb9305f6d521061dde7dac0966bab78735355e0c 100644 (file)
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -36,6 +36,8 @@
 
 #define DEFAULT_OUTPUT_FORMAT "bits:width=64"
 
+static struct sr_context *sr_ctx = NULL;
+
 static uint64_t limit_samples = 0;
 static uint64_t limit_frames = 0;
 static struct sr_output_format *output_format = NULL;
@@ -162,7 +164,7 @@ static GSList *device_scan(void)
                        return NULL;
                }
                g_free(drvname);
-               if (sr_driver_init(driver) != SR_OK) {
+               if (sr_driver_init(sr_ctx, driver) != SR_OK) {
                        g_critical("Failed to initialize driver.");
                        return NULL;
                }
@@ -178,7 +180,7 @@ static GSList *device_scan(void)
                drivers = sr_driver_list();
                for (i = 0; drivers[i]; i++) {
                        driver = drivers[i];
-                       if (sr_driver_init(driver) != SR_OK) {
+                       if (sr_driver_init(sr_ctx, driver) != SR_OK) {
                                g_critical("Failed to initialize driver.");
                                return NULL;
                        }
@@ -194,7 +196,7 @@ static GSList *device_scan(void)
 
 static void show_version(void)
 {
-       GSList *l;
+       const GSList *l;
        struct sr_dev_driver **drivers;
        struct sr_input_format **inputs;
        struct sr_output_format **outputs;
@@ -438,7 +440,7 @@ static void show_dev_detail(void)
                                printf("      %s\n", stropts[i]);
 
                } else if (hwo->hwcap == SR_HWCAP_FILTER) {
-                       /* Supported trigger sources */
+                       /* Supported filters */
                        printf("    %s", hwo->shortname);
                        if (sr_info_get(sdi->driver, SR_DI_FILTERS,
                                        (const void **)&stropts, sdi) != SR_OK) {
@@ -538,22 +540,18 @@ static void show_pd_detail(void)
 }
 
 static void datafeed_in(const struct sr_dev_inst *sdi,
-               struct sr_datafeed_packet *packet)
+               const struct sr_datafeed_packet *packet)
 {
        static struct sr_output *o = NULL;
        static int logic_probelist[SR_MAX_NUM_PROBES] = { -1 };
-       static struct sr_probe *analog_probelist[SR_MAX_NUM_PROBES];
        static uint64_t received_samples = 0;
        static int unitsize = 0;
        static int triggered = 0;
        static FILE *outfile = NULL;
-       static int num_analog_probes = 0;
        struct sr_probe *probe;
-       struct sr_datafeed_logic *logic;
-       struct sr_datafeed_meta_logic *meta_logic;
-       struct sr_datafeed_analog *analog;
-       struct sr_datafeed_meta_analog *meta_analog;
-       static int num_enabled_analog_probes = 0;
+       const struct sr_datafeed_logic *logic;
+       const struct sr_datafeed_meta_logic *meta_logic;
+       const struct sr_datafeed_analog *analog;
        int num_enabled_probes, sample_size, ret, i;
        uint64_t output_len, filter_out_len;
        uint8_t *output_buf, *filter_out;
@@ -717,14 +715,6 @@ static void datafeed_in(const struct sr_dev_inst *sdi,
 
        case SR_DF_META_ANALOG:
                g_message("cli: Received SR_DF_META_ANALOG");
-               meta_analog = packet->payload;
-               num_analog_probes = meta_analog->num_probes;
-               num_enabled_analog_probes = 0;
-               for (i = 0; i < num_analog_probes; i++) {
-                       probe = g_slist_nth_data(sdi->probes, i);
-                       if (probe->enabled)
-                               analog_probelist[num_enabled_analog_probes++] = probe;
-               }
 
                outfile = stdout;
                if (opt_output_file) {
@@ -1286,8 +1276,6 @@ static int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args)
                        g_critical("Failed to set device option '%s'.", (char *)key);
                        return ret;
                }
-               else
-                       break;
        }
 
        return SR_OK;
@@ -1476,7 +1464,6 @@ int main(int argc, char **argv)
        int ret = 1;
        GOptionContext *context;
        GError *error;
-       struct sr_context *sr_ctx = NULL;
 
        g_log_set_default_handler(logger, NULL);