X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput_ols.c;h=bdd7d786266972a33dc9fd9b4806239dc430e549;hb=a00ba012288726678e1a270961c8d4f46f3dbd33;hp=acf10af66981a0224aeb37b91d96f0fd5c9988a1;hpb=e46b8fb154ba90ffec9c1f805399dfa819e736f9;p=libsigrok.git

diff --git a/output/output_ols.c b/output/output_ols.c
index acf10af6..bdd7d786 100644
--- a/output/output_ols.c
+++ b/output/output_ols.c
@@ -66,7 +66,7 @@ struct context {
 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;
@@ -105,7 +105,7 @@ static int init(struct output *o)
 	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 SR_ERR;
@@ -122,7 +122,7 @@ static int init(struct output *o)
 		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 SR_ERR;
@@ -155,7 +155,7 @@ static int init(struct output *o)
 	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;
@@ -177,7 +177,7 @@ static int event(struct output *o, int event_type, char **data_out,
 	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;
@@ -218,7 +218,7 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
 	return SR_OK;
 }
 
-struct output_format output_ols = {
+struct sr_output_format output_ols = {
 	"ols",
 	"OpenBench Logic Sniffer",
 	DF_LOGIC,