#include <stdlib.h>
#include <string.h>
#include <glib.h>
-#include <sigrok.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
#include "text.h"
-
-int init_ascii(struct output *o)
+int init_ascii(struct sr_output *o)
{
return init(o, DEFAULT_BPL_ASCII, MODE_ASCII);
}
-int data_ascii(struct output *o, char *data_in, uint64_t length_in,
- char **data_out, uint64_t *length_out)
+int data_ascii(struct sr_output *o, const char *data_in, uint64_t length_in,
+ char **data_out, uint64_t *length_out)
{
struct context *ctx;
unsigned int outsize, offset, p;
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
* (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) {
ctx->prevsample = sample;
}
} else {
- g_message("short buffer (length_in=%" PRIu64 ")", length_in);
+ sr_info("short buffer (length_in=%" PRIu64 ")", length_in);
}
*data_out = outbuf;
*length_out = strlen(outbuf);
- return SIGROK_OK;
+ return SR_OK;
}
-
-struct output_format output_text_ascii = {
- "ascii",
- "ASCII (takes argument, default 74)",
- DF_LOGIC,
- init_ascii,
- data_ascii,
- event,
+struct sr_output_format output_text_ascii = {
+ .id = "ascii",
+ .description = "ASCII (takes argument, default 74)",
+ .df_type = SR_DF_LOGIC,
+ .init = init_ascii,
+ .data = data_ascii,
+ .event = event,
};
-