lecroy-xstream: Fix sample rate

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

diff --git a/src/input/trace32_ad.c b/src/input/trace32_ad.c
index 4c991a987ca74e094d255d34d0f0a799260d3da9..7817457f81178fdb306bdac1bcd271658dce7d87 100644 (file)
--- a/src/input/trace32_ad.c
+++ b/src/input/trace32_ad.c
@@ -50,7 +50,7 @@
 #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 +79,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 {
@@ -253,8 +253,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 +291,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++;
@@ -683,7 +683,7 @@ static int process_buffer(struct sr_input *in)
        }
 
        if (!inc->meta_sent) {
-               std_session_send_df_header(in->sdi, LOG_PREFIX);
+               std_session_send_df_header(in->sdi);
                send_metadata(in);
        }
 
@@ -751,7 +751,7 @@ static int end(struct sr_input *in)
        flush_output_buffer(in);
 
        if (inc->meta_sent)
-               std_session_send_df_end(in->sdi, LOG_PREFIX);
+               std_session_send_df_end(in->sdi);
 
        return ret;
 }