X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Ftrace32_ad.c;h=779c0dac058df5032d4baa5eea006bb55e73d855;hb=cdb134eb19e23528ec9c9dd89805087ea3edb9b6;hp=a9b1ca4f53e09c9b3a02eeed912bbf8174c8291a;hpb=bee2b0168c087676c1b365861d8c2d4714afa9b9;p=libsigrok.git

diff --git a/src/input/trace32_ad.c b/src/input/trace32_ad.c
index a9b1ca4f..779c0dac 100644
--- a/src/input/trace32_ad.c
+++ b/src/input/trace32_ad.c
@@ -45,12 +45,11 @@
 
 #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
 
-#define TIMESTAMP_RESOLUTION  ((double)0.000000000078125) /* 0.078125 ns */
+#define TIMESTAMP_RESOLUTION ((double)0.000000000078125) /* 0.078125 ns */
 
 /*
  * The resolution equals a sampling freq of 12.8 GHz. That's a bit high
@@ -79,7 +78,7 @@ enum {
 
 enum {
 	AD_COMPR_NONE  = 0, /* File created with /NOCOMPRESS */
-	AD_COMPR_QCOMP = 6  /* File created with /COMPRESS or /QUICKCOMPRESS */
+	AD_COMPR_QCOMP = 6, /* File created with /COMPRESS or /QUICKCOMPRESS */
 };
 
 struct context {
@@ -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;
 	}
 
@@ -253,8 +258,8 @@ static int process_header(GString *buf, struct context *inc)
 
 	inc->device       = device_id;
 	inc->trigger_timestamp = RL64(buf->str + 32);
-	inc->compression  = R8(buf->str + 48);        /* Maps to the enum. */
-	inc->record_mode  = R8(buf->str + 55);        /* Maps to the enum. */
+	inc->compression  = R8(buf->str + 48); /* Maps to the enum. */
+	inc->record_mode  = R8(buf->str + 55); /* Maps to the enum. */
 	inc->record_size  = record_size;
 	inc->record_count = RL32(buf->str + 60);
 	inc->last_record  = RL32S(buf->str + 64);
@@ -291,13 +296,13 @@ static void create_channels(struct sr_input *in)
 			continue;
 
 		for (channel = 0; channel < 16; channel++) {
-			snprintf(name, 8, "%c%d", get_pod_name_from_id(pod), channel);
+			snprintf(name, sizeof(name), "%c%d", get_pod_name_from_id(pod), channel);
 			inc->channels[pod][channel] =
 				sr_channel_new(in->sdi, chan_id, SR_CHANNEL_LOGIC, TRUE, name);
 			chan_id++;
 		}
 
-		snprintf(name, 8, "CLK%c", get_pod_name_from_id(pod));
+		snprintf(name, sizeof(name), "CLK%c", get_pod_name_from_id(pod));
 		inc->channels[pod][16] =
 			sr_channel_new(in->sdi, chan_id, SR_CHANNEL_LOGIC, TRUE, name);
 		chan_id++;
@@ -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
 };