Introduce OutputFlag

[libsigrok.git] / src / output / ols.c

diff --git a/src/output/ols.c b/src/output/ols.c
index 78a41bb0b4645032eb342ef1796246d165b6da6b..1202a93ec74cac8ad37f1cdab3138ff859cf620d 100644 (file)
--- a/src/output/ols.c
+++ b/src/output/ols.c
@@ -38,16 +38,14 @@ struct context {
        uint64_t num_samples;
 };
 
-static int init(struct sr_output *o)
+static int init(struct sr_output *o, GHashTable *options)
 {
        struct context *ctx;
 
-       if (!(ctx = g_try_malloc(sizeof(struct context)))) {
-               sr_err("%s: ctx malloc failed", __func__);
-               return SR_ERR_MALLOC;
-       }
-       o->internal = ctx;
+       (void)options;
 
+       ctx = g_malloc0(sizeof(struct context));
+       o->priv = ctx;
        ctx->samplerate = 0;
        ctx->num_samples = 0;
 
@@ -88,7 +86,7 @@ static GString *gen_header(const struct sr_dev_inst *sdi, struct context *ctx)
        return s;
 }
 
-static int receive(struct sr_output *o, const struct sr_datafeed_packet *packet,
+static int receive(const struct sr_output *o, const struct sr_datafeed_packet *packet,
                GString **out)
 {
        struct context *ctx;
@@ -102,7 +100,7 @@ static int receive(struct sr_output *o, const struct sr_datafeed_packet *packet,
        *out = NULL;
        if (!o || !o->sdi)
                return SR_ERR_ARG;
-       ctx = o->internal;
+       ctx = o->priv;
 
        switch (packet->type) {
        case SR_DF_META:
@@ -141,16 +139,20 @@ static int cleanup(struct sr_output *o)
        if (!o || !o->sdi)
                return SR_ERR_ARG;
 
-       ctx = o->internal;
+       ctx = o->priv;
        g_free(ctx);
-       o->internal = NULL;
+       o->priv = NULL;
 
        return SR_OK;
 }
 
-SR_PRIV struct sr_output_format output_ols = {
+SR_PRIV struct sr_output_module output_ols = {
        .id = "ols",
-       .description = "OpenBench Logic Sniffer",
+       .name = "OLS",
+       .desc = "OpenBench Logic Sniffer",
+       .exts = (const char*[]){"ols", NULL},
+       .flags = 0,
+       .options = NULL,
        .init = init,
        .receive = receive,
        .cleanup = cleanup