input/trace32_ad: silence format errors during input format match

[libsigrok.git] / src / input / trace32_ad.c

diff --git a/src/input/trace32_ad.c b/src/input/trace32_ad.c
index 7817457f81178fdb306bdac1bcd271658dce7d87..779c0dac058df5032d4baa5eea006bb55e73d855 100644 (file)
--- a/src/input/trace32_ad.c
+++ b/src/input/trace32_ad.c
@@ -45,8 +45,7 @@
 
 #define LOG_PREFIX "input/trace32_ad"
 
-#define MAX_CHUNK_SIZE    4096
-#define OUTBUF_FLUSH_SIZE 10240
+#define CHUNK_SIZE        (4 * 1024 * 1024)
 #define MAX_POD_COUNT     12
 #define HEADER_SIZE       80
 
@@ -152,7 +151,7 @@ static int init(struct sr_input *in, GHashTable *options)
                return SR_ERR;
        }
 
-       inc->out_buf = g_string_sized_new(OUTBUF_FLUSH_SIZE);
+       inc->out_buf = g_string_sized_new(CHUNK_SIZE);
 
        return SR_OK;
 }
@@ -214,12 +213,18 @@ static int process_header(GString *buf, struct context *inc)
                        inc->format = AD_FORMAT_TXTHDR;
                g_free(format_name_sig);
                g_free(format_name);
-               sr_err("This format isn't implemented yet, aborting.");
+               if (inc)
+                       sr_err("This format isn't implemented yet, aborting.");
+               else
+                       sr_dbg("Not a supported trace32 input file.");
                return SR_ERR;
        } else {
                g_free(format_name_sig);
                g_free(format_name);
-               sr_err("Don't know this file format, aborting.");
+               if (inc)
+                       sr_err("Don't know this file format, aborting.");
+               else
+                       sr_dbg("Not a trace32 input file.");
                return SR_ERR;
        }
 
@@ -502,7 +507,7 @@ static void process_record_pi(struct sr_input *in, gsize start)
                        g_string_append_len(inc->out_buf, single_payload, payload_len);
        }
 
-       if (inc->out_buf->len >= OUTBUF_FLUSH_SIZE)
+       if (inc->out_buf->len >= CHUNK_SIZE)
                flush_output_buffer(in);
 }
 
@@ -555,7 +560,7 @@ static void process_record_iprobe(struct sr_input *in, gsize start)
                        g_string_append_len(inc->out_buf, single_payload, payload_len);
        }
 
-       if (inc->out_buf->len >= OUTBUF_FLUSH_SIZE)
+       if (inc->out_buf->len >= CHUNK_SIZE)
                flush_output_buffer(in);
 }
 
@@ -787,7 +792,7 @@ static struct sr_option options[] = {
        { "podN", "Import pod N", "Create channels and data for pod N", NULL, NULL },
        { "podO", "Import pod O", "Create channels and data for pod O", NULL, NULL },
 
-       { "samplerate", "Reduced sample rate in MHz", "Reduced sample rate in MHz", NULL, NULL },
+       { "samplerate", "Reduced sample rate (MHz)", "Reduce the original sample rate of 12.8 GHz to the specified sample rate in MHz", NULL, NULL },
 
        ALL_ZERO
 };