const char *ols_header_comment = "\
# Comment: Acquisition with %d/%d probes at %s";
-static int init(struct output *o)
+static int init(struct sr_output *o)
{
struct context *ctx;
struct probe *probe;
time_t t;
if (!(ctx = calloc(1, sizeof(struct context))))
- return SIGROK_ERR_MALLOC;
+ return SR_ERR_MALLOC;
if (!(ctx->header = calloc(1, MAX_HEADER_LEN + 1))) {
free(ctx);
- return SIGROK_ERR_MALLOC;
+ return SR_ERR_MALLOC;
}
o->internal = ctx;
if (o->device->plugin) {
samplerate = *((uint64_t *) o->device->plugin->get_device_info(
o->device->plugin_index, DI_CUR_SAMPLERATE));
- if (!(frequency_s = sigrok_samplerate_string(samplerate))) {
+ if (!(frequency_s = sr_samplerate_string(samplerate))) {
free(ctx->header);
free(ctx);
- return SIGROK_ERR;
+ return SR_ERR;
}
snprintf(comment, 127, ols_header_comment,
ctx->num_enabled_probes, num_probes, frequency_s);
sprintf(c, "# %d\t\t%s\n", i + 1, ctx->probelist[i]);
}
- if (!(frequency_s = sigrok_period_string(samplerate))) {
+ if (!(frequency_s = sr_period_string(samplerate))) {
free(ctx->header);
free(ctx);
- return SIGROK_ERR;
+ return SR_ERR;
}
t = time(NULL);
if (b < 0) {
free(ctx->header);
free(ctx);
- return SIGROK_ERR;
+ return SR_ERR;
}
return 0;
}
-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;
*data_out = NULL;
*length_out = 0;
- return SIGROK_OK;
+ return SR_OK;
}
-static int data(struct output *o, char *data_in, uint64_t length_in,
+static int data(struct sr_output *o, char *data_in, uint64_t length_in,
char **data_out, uint64_t *length_out)
{
struct context *ctx;
outsize += strlen(ctx->header);
if (!(outbuf = calloc(1, outsize)))
- return SIGROK_ERR_MALLOC;
+ return SR_ERR_MALLOC;
outbuf[0] = '\0';
if (ctx->header) {
*data_out = outbuf;
*length_out = strlen(outbuf);
- return SIGROK_OK;
+ return SR_OK;
}
-struct output_format output_ols = {
+struct sr_output_format output_ols = {
"ols",
"OpenBench Logic Sniffer",
DF_LOGIC,