SR_ prefix for all public enums.

[libsigrok.git] / output / output_analog.c

diff --git a/output/output_analog.c b/output/output_analog.c
index 075dcb2a11e479c30dc8fc303ac51ed731fefd89..40d5218105db54e3db890bcc16d198fa4cf99ec6 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;
@@ -135,8 +135,8 @@ static int init(struct output *o, int default_spl, enum outputmode mode)
        num_probes = g_slist_length(o->device->probes);
        if (o->device->plugin) {
                samplerate = *((uint64_t *) o->device->plugin->get_device_info(
-                               o->device->plugin_index, DI_CUR_SAMPLERATE));
-               if (!(samplerate_s = sigrok_samplerate_string(samplerate))) {
+                               o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
+               if (!(samplerate_s = sr_samplerate_string(samplerate))) {
                        free(ctx->header);
                        free(ctx);
                        return SR_ERR;
@@ -163,7 +163,7 @@ static int init(struct output *o, int default_spl, enum outputmode mode)
        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;
@@ -172,12 +172,12 @@ static int event(struct output *o, int event_type, char **data_out,
 
        ctx = o->internal;
        switch (event_type) {
-       case DF_TRIGGER:
+       case SR_DF_TRIGGER:
                ctx->mark_trigger = ctx->spl_cnt;
                *data_out = NULL;
                *length_out = 0;
                break;
-       case DF_END:
+       case SR_DF_END:
                outsize = ctx->num_enabled_probes
                                * (ctx->samples_per_line + 20) + 512;
                if (!(outbuf = calloc(1, outsize)))
@@ -197,12 +197,12 @@ static int event(struct output *o, int event_type, char **data_out,
        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;
@@ -283,12 +283,12 @@ static int data_bits(struct output *o, char *data_in, uint64_t length_in,
        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;
@@ -348,12 +348,12 @@ static int data_hex(struct output *o, char *data_in, uint64_t length_in,
        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;
@@ -438,28 +438,28 @@ static int data_ascii(struct output *o, char *data_in, uint64_t length_in,
 }
 #endif
 
-struct output_format output_analog_bits = {
+struct sr_output_format output_analog_bits = {
        "analog_bits",
        "Bits (takes argument, default 64)",
-       DF_ANALOG,
+       SR_DF_ANALOG,
        init_bits,
        data_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,
+       SR_DF_ANALOG,
        init_hex,
        data_hex,
        event,
 };
 
-struct output_format output_analog_ascii = {
+struct sr_output_format output_analog_ascii = {
        "analog_ascii",
        "ASCII (takes argument, default 74)",
-       DF_ANALOG,
+       SR_DF_ANALOG,
        init_ascii,
        data_ascii,
        event,