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

diff --git a/output/output_ols.c b/output/output_ols.c
index a288ad50..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;
@@ -79,11 +79,11 @@ static int init(struct output *o)
 	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;
@@ -105,10 +105,10 @@ 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 SIGROK_ERR;
+			return SR_ERR;
 		}
 		snprintf(comment, 127, ols_header_comment,
 			 ctx->num_enabled_probes, num_probes, frequency_s);
@@ -122,10 +122,10 @@ 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 SIGROK_ERR;
+		return SR_ERR;
 	}
 
 	t = time(NULL);
@@ -149,13 +149,13 @@ static int init(struct output *o)
 	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;
@@ -174,10 +174,10 @@ static int event(struct output *o, int event_type, char **data_out,
 	*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;
@@ -193,7 +193,7 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
 		outsize += strlen(ctx->header);
 
 	if (!(outbuf = calloc(1, outsize)))
-		return SIGROK_ERR_MALLOC;
+		return SR_ERR_MALLOC;
 
 	outbuf[0] = '\0';
 	if (ctx->header) {
@@ -215,10 +215,10 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
 	*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,