Add sr_ prefix to input/output structs.

[libsigrok.git] / output / output_analog.c

diff --git a/output/output_analog.c b/output/output_analog.c
index b68f60faf1767b9f53be08afebac067e3df77b0f..6a48a495393000f31d7880eca04d31544c1e2d2d 100644 (file)
--- a/output/output_analog.c
+++ b/output/output_analog.c
@@ -89,7 +89,7 @@ static void flush_linebufs(struct context *ctx, char *outbuf)
        memset(ctx->linebuf, 0, i * ctx->linebuf_len);
 }
 
-static int init(struct output *o, int default_spl, enum outputmode mode)
+static int init(struct sr_output *o, int default_spl, enum outputmode mode)
 {
        struct context *ctx;
        struct probe *probe;
@@ -99,7 +99,7 @@ static int init(struct output *o, int default_spl, enum outputmode mode)
        char *samplerate_s;
 
        if (!(ctx = calloc(1, sizeof(struct context))))
-               return SIGROK_ERR_MALLOC;
+               return SR_ERR_MALLOC;
 
        o->internal = ctx;
        ctx->num_enabled_probes = 0;
@@ -122,13 +122,13 @@ static int init(struct output *o, int default_spl, enum outputmode mode)
        if (o->param && o->param[0]) {
                ctx->samples_per_line = strtoul(o->param, NULL, 10);
                if (ctx->samples_per_line < 1)
-                       return SIGROK_ERR;
+                       return SR_ERR;
        } else
                ctx->samples_per_line = default_spl;
 
        if (!(ctx->header = malloc(512))) {
                free(ctx);
-               return SIGROK_ERR_MALLOC;
+               return SR_ERR_MALLOC;
        }
 
        snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING);
@@ -139,7 +139,7 @@ static int init(struct output *o, int default_spl, enum outputmode mode)
                if (!(samplerate_s = sigrok_samplerate_string(samplerate))) {
                        free(ctx->header);
                        free(ctx);
-                       return SIGROK_ERR;
+                       return SR_ERR;
                }
                snprintf(ctx->header + strlen(ctx->header),
                         511 - strlen(ctx->header),
@@ -152,18 +152,18 @@ static int init(struct output *o, int default_spl, enum outputmode mode)
        if (!(ctx->linebuf = calloc(1, num_probes * ctx->linebuf_len))) {
                free(ctx->header);
                free(ctx);
-               return SIGROK_ERR_MALLOC;
+               return SR_ERR_MALLOC;
        }
        if (!(ctx->linevalues = calloc(1, num_probes))) {
                free(ctx->header);
                free(ctx);
-               return SIGROK_ERR_MALLOC;
+               return SR_ERR_MALLOC;
        }
 
-       return SIGROK_OK;
+       return SR_OK;
 }
 
-static int event(struct output *o, int event_type, char **data_out,
+static int event(struct sr_output *o, int event_type, char **data_out,
                 uint64_t *length_out)
 {
        struct context *ctx;
@@ -181,7 +181,7 @@ static int event(struct output *o, int event_type, char **data_out,
                outsize = ctx->num_enabled_probes
                                * (ctx->samples_per_line + 20) + 512;
                if (!(outbuf = calloc(1, outsize)))
-                       return SIGROK_ERR_MALLOC;
+                       return SR_ERR_MALLOC;
                flush_linebufs(ctx, outbuf);
                *data_out = outbuf;
                *length_out = strlen(outbuf);
@@ -194,15 +194,15 @@ static int event(struct output *o, int event_type, char **data_out,
                break;
        }
 
-       return SIGROK_OK;
+       return SR_OK;
 }
 
-static int init_bits(struct output *o)
+static int init_bits(struct sr_output *o)
 {
        return init(o, DEFAULT_BPL_BITS, MODE_BITS);
 }
 
-static int data_bits(struct output *o, char *data_in, uint64_t length_in,
+static int data_bits(struct sr_output *o, char *data_in, uint64_t length_in,
                     char **data_out, uint64_t *length_out)
 {
        struct context *ctx;
@@ -222,7 +222,7 @@ static int data_bits(struct output *o, char *data_in, uint64_t length_in,
             * (ctx->num_enabled_probes * max_linelen);
 
        if (!(outbuf = calloc(1, outsize + 1)))
-               return SIGROK_ERR_MALLOC;
+               return SR_ERR_MALLOC;
 
        outbuf[0] = '\0';
        if (ctx->header) {
@@ -280,15 +280,15 @@ static int data_bits(struct output *o, char *data_in, uint64_t length_in,
        *data_out = outbuf;
        *length_out = strlen(outbuf);
 
-       return SIGROK_OK;
+       return SR_OK;
 }
 #if 0
-static int init_hex(struct output *o)
+static int init_hex(struct sr_output *o)
 {
        return init(o, DEFAULT_BPL_HEX, MODE_HEX);
 }
 
-static int data_hex(struct output *o, char *data_in, uint64_t length_in,
+static int data_hex(struct sr_output *o, char *data_in, uint64_t length_in,
                    char **data_out, uint64_t *length_out)
 {
        struct context *ctx;
@@ -304,7 +304,7 @@ static int data_hex(struct output *o, char *data_in, uint64_t length_in,
                        / ctx->samples_per_line * max_linelen + 512;
 
        if (!(outbuf = calloc(1, outsize + 1)))
-               return SIGROK_ERR_MALLOC;
+               return SR_ERR_MALLOC;
 
        outbuf[0] = '\0';
        if (ctx->header) {
@@ -345,15 +345,15 @@ static int data_hex(struct output *o, char *data_in, uint64_t length_in,
        *data_out = outbuf;
        *length_out = strlen(outbuf);
 
-       return SIGROK_OK;
+       return SR_OK;
 }
 
-static int init_ascii(struct output *o)
+static int init_ascii(struct sr_output *o)
 {
        return init(o, DEFAULT_BPL_ASCII, MODE_ASCII);
 }
 
-static int data_ascii(struct output *o, char *data_in, uint64_t length_in,
+static int data_ascii(struct sr_output *o, char *data_in, uint64_t length_in,
                     char **data_out, uint64_t *length_out)
 {
        struct context *ctx;
@@ -373,7 +373,7 @@ static int data_ascii(struct output *o, char *data_in, uint64_t length_in,
             * (ctx->num_enabled_probes * max_linelen);
 
        if (!(outbuf = calloc(1, outsize + 1)))
-               return SIGROK_ERR_MALLOC;
+               return SR_ERR_MALLOC;
 
        outbuf[0] = '\0';
        if (ctx->header) {
@@ -434,11 +434,11 @@ static int data_ascii(struct output *o, char *data_in, uint64_t length_in,
        *data_out = outbuf;
        *length_out = strlen(outbuf);
 
-       return SIGROK_OK;
+       return SR_OK;
 }
 #endif
 
-struct output_format output_analog_bits = {
+struct sr_output_format output_analog_bits = {
        "analog_bits",
        "Bits (takes argument, default 64)",
        DF_ANALOG,
@@ -447,7 +447,7 @@ struct output_format output_analog_bits = {
        event,
 };
 #if 0
-struct output_format output_analog_hex = {
+struct sr_output_format output_analog_hex = {
        "analog_hex",
        "Hexadecimal (takes argument, default 192)",
        DF_ANALOG,
@@ -456,7 +456,7 @@ struct output_format output_analog_hex = {
        event,
 };
 
-struct output_format output_analog_ascii = {
+struct sr_output_format output_analog_ascii = {
        "analog_ascii",
        "ASCII (takes argument, default 74)",
        DF_ANALOG,