Allow setting samplerate when reading binary files

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

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 3bda15857377cb9f4c7546a08001eb9f6d797eec..a0e4f08aa1e99f219d7d4825a3d13a3756ac29fc 100644 (file)
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -30,7 +30,7 @@
 #include <errno.h>
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <sigrok.h>
+#include <libsigrok/libsigrok.h>
 #include "sigrok-cli.h"
 #include "config.h"
 
@@ -43,7 +43,6 @@ static uint64_t limit_frames = 0;
 static struct sr_output_format *output_format = NULL;
 static int default_output_format = FALSE;
 static char *output_format_param = NULL;
-static char *input_format_param = NULL;
 static GHashTable *pd_ann_visible = NULL;
 
 static gboolean opt_version = FALSE;
@@ -485,7 +484,7 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
                if (opt_continuous)
                        g_warning("Device stopped after %" PRIu64 " samples.",
                               received_samples);
-               sr_session_halt();
+               sr_session_stop();
                if (outfile && outfile != stdout)
                        fclose(outfile);
                g_free(o);
@@ -576,13 +575,14 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
                if (opt_pds) {
                        if (srd_session_send(received_samples, (uint8_t*)filter_out,
                                        filter_out_len) != SRD_OK)
-                               sr_session_halt();
+                               sr_session_stop();
                } else {
                        output_len = 0;
                        if (o->format->data && packet->type == o->format->df_type)
                                o->format->data(o, filter_out, filter_out_len, &output_buf, &output_len);
                        if (output_buf) {
                                fwrite(output_buf, 1, output_len, outfile);
+                               fflush(outfile);
                                g_free(output_buf);
                        }
                }
@@ -638,6 +638,7 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
                                        &output_buf, &output_len);
                        if (output_buf) {
                                fwrite(output_buf, 1, output_len, outfile);
+                               fflush(outfile);
                                g_free(output_buf);
                        }
                }
@@ -652,6 +653,7 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
                                         &output_len);
                        if (output_buf) {
                                fwrite(output_buf, 1, output_len, outfile);
+                               fflush(outfile);
                                g_free(output_buf);
                        }
                }
@@ -664,6 +666,7 @@ static void datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
                                         &output_len);
                        if (output_buf) {
                                fwrite(output_buf, 1, output_len, outfile);
+                               fflush(outfile);
                                g_free(output_buf);
                        }
                }
@@ -923,6 +926,7 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
        for (i = 0; annotations[i]; i++)
                printf("\"%s\" ", annotations[i]);
        printf("\n");
+       fflush(stdout);
 }
 
 static int select_probes(struct sr_dev *dev)
@@ -986,7 +990,7 @@ static struct sr_input_format *determine_input_file_format(
        /* If the user specified -I / --input-format, use that one. */
        if (opt) {
                for (i = 0; inputs[i]; i++) {
-                       if (strcasecmp(inputs[i]->id, opt_input_format))
+                       if (strcasecmp(inputs[i]->id, opt))
                                continue;
                        g_debug("Using user-specified input file format '%s'.",
                                        inputs[i]->id);
@@ -995,7 +999,7 @@ static struct sr_input_format *determine_input_file_format(
 
                /* The user specified an unknown input format, return NULL. */
                g_critical("Error: specified input file format '%s' is "
-                       "unknown.", opt_input_format);
+                       "unknown.", opt);
                return NULL;
        }
 
@@ -1019,14 +1023,25 @@ static struct sr_input_format *determine_input_file_format(
 
 static void load_input_file_format(void)
 {
+       GHashTable *fmtargs = NULL;
        struct stat st;
        struct sr_input *in;
        struct sr_input_format *input_format;
+       char *fmtspec = NULL;
+
+       if (opt_input_format) {
+               fmtargs = parse_generic_arg(opt_input_format);
+               fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
+       }
 
        if (!(input_format = determine_input_file_format(opt_input_file,
-                                                  opt_input_format)))
+                                                  fmtspec))) {
                /* The exact cause was already logged. */
                return;
+       }
+;
+       if (fmtargs)
+               g_hash_table_remove(fmtargs, "sigrok_key");
 
        if (stat(opt_input_file, &st) == -1) {
                g_critical("Failed to load %s: %s", opt_input_file,
@@ -1040,7 +1055,7 @@ static void load_input_file_format(void)
                exit(1);
        }
        in->format = input_format;
-       in->param = input_format_param;
+       in->param = fmtargs;
        if (in->format->init) {
                if (in->format->init(in) != SR_OK) {
                        g_critical("Input format init failed.");
@@ -1065,6 +1080,9 @@ static void load_input_file_format(void)
                        g_critical("Failed to save session.");
        }
        sr_session_destroy();
+
+       if (fmtargs)
+               g_hash_table_destroy(fmtargs);
 }
 
 static void load_input_file(void)