Add SR_ prefix for MAX_NUM_PROBES/MAX_PROBENAME_LEN.

diff --git a/output/output_analog.c b/output/output_analog.c
index 0eb897f7607f547b175911865e650ef8373353c1..0f60dd35795912fc2a775eae30d0546ef27d84b7 100644 (file)
--- a/output/output_analog.c
+++ b/output/output_analog.c
@@ -212,7 +212,7 @@ static int data_bits(struct sr_output *o, const char *data_in,
        char *outbuf, c;
 
        ctx = o->internal;
-       max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+       max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
                        + ctx->samples_per_line / 8;
         /*
          * Calculate space needed for probes. Set aside 512 bytes for
@@ -298,7 +298,7 @@ static int data_hex(struct sr_output *o, const char *data_in,
        char *outbuf;
 
        ctx = o->internal;
-       max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+       max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
                        + ctx->samples_per_line / 2;
        outsize = length_in / ctx->unitsize * ctx->num_enabled_probes
                        / ctx->samples_per_line * max_linelen + 512;
@@ -363,7 +363,7 @@ static int data_ascii(struct sr_output *o, const char *data_in,
        char *outbuf;
 
        ctx = o->internal;
-       max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+       max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
                        + ctx->samples_per_line / 8;
         /*
          * Calculate space needed for probes. Set aside 512 bytes for

diff --git a/output/output_gnuplot.c b/output/output_gnuplot.c
index 09a42ad65568977c1a6e481705c26f2feda4eb72..43033777f4ee2abe1649c89b369f653fe4b4384f 100644 (file)
--- a/output/output_gnuplot.c
+++ b/output/output_gnuplot.c
@@ -27,11 +27,13 @@
 struct context {
        unsigned int num_enabled_probes;
        unsigned int unitsize;
-       char *probelist[MAX_NUM_PROBES+1];
+       char *probelist[SR_MAX_NUM_PROBES + 1];
        char *header;
 };
 
-#define MAX_HEADER_LEN   1024 + (MAX_NUM_PROBES * (MAX_PROBENAME_LEN + 10))
+#define MAX_HEADER_LEN \
+       (1024 + (SR_MAX_NUM_PROBES * (SR_MAX_PROBENAME_LEN + 10)))
+
 const char *gnuplot_header = "\
 # Sample data in space-separated columns format usable by gnuplot\n\
 #\n\

diff --git a/output/text/ascii.c b/output/text/ascii.c
index e4eacaf3d3d90c71a38efa66e65ada95c660e09b..04d39ea37565f297ddd045e9c2e51d1f3d4df5f3 100644 (file)
--- a/output/text/ascii.c
+++ b/output/text/ascii.c
@@ -40,7 +40,7 @@ int data_ascii(struct sr_output *o, const char *data_in, uint64_t length_in,
        char *outbuf;
 
        ctx = o->internal;
-       max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+       max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
                        + ctx->samples_per_line / 8;
         /*
          * Calculate space needed for probes. Set aside 512 bytes for

diff --git a/output/text/bits.c b/output/text/bits.c
index ccf550701e1c816affb0a94aa99220b5fca3fdfd..43eb7d0200633cd0c86ff462eadc4c6668053721 100644 (file)
--- a/output/text/bits.c
+++ b/output/text/bits.c
@@ -40,7 +40,7 @@ int data_bits(struct sr_output *o, const char *data_in, uint64_t length_in,
        char *outbuf, c;
 
        ctx = o->internal;
-       max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+       max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
                        + ctx->samples_per_line / 8;
         /*
          * Calculate space needed for probes. Set aside 512 bytes for

diff --git a/output/text/hex.c b/output/text/hex.c
index 37785af360a19e4f5abac3d64a4efdd708c06064..bd9aa09d49f141dcd1f3bef1425d553ec8e29d75 100644 (file)
--- a/output/text/hex.c
+++ b/output/text/hex.c
@@ -40,7 +40,7 @@ int data_hex(struct sr_output *o, const char *data_in, uint64_t length_in,
        char *outbuf;
 
        ctx = o->internal;
-       max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+       max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
                        + ctx->samples_per_line / 2;
        outsize = length_in / ctx->unitsize * ctx->num_enabled_probes
                        / ctx->samples_per_line * max_linelen + 512;

diff --git a/sigrok.h b/sigrok.h
index 6eeca9a3c9ff1617ed707204398d9bcce2361338..2eda97ba590a129abec54042f32103e82f9b3620 100644 (file)
--- a/sigrok.h
+++ b/sigrok.h
@@ -55,9 +55,8 @@ extern "C" {
 #define SR_ERR_MALLOC        -2 /* Malloc/calloc/realloc error */
 #define SR_ERR_SAMPLERATE    -3 /* Incorrect samplerate */
 
-/* limited by uint64_t */
-#define MAX_NUM_PROBES 64
-#define MAX_PROBENAME_LEN 32
+#define SR_MAX_NUM_PROBES      64 /* Limited by uint64_t. */
+#define SR_MAX_PROBENAME_LEN   32
 
 /* Handy little macros */
 #define KHZ(n) ((n) * 1000)