X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=output%2Fols.c;h=e0196717e7a67ef8db385bc12c1c1fa3c3cadc66;hb=94c26b08fdc2568a33e176b895c63048a4b66464;hp=92d1d106de57b9ab09542102401b0a7b39869625;hpb=1a081ca67d63a0bd933a3d715792d85afd437296;p=libsigrok.git

diff --git a/output/ols.c b/output/ols.c
index 92d1d106..e0196717 100644
--- a/output/ols.c
+++ b/output/ols.c
@@ -2,7 +2,7 @@
  * This file is part of the sigrok project.
  *
  * Copyright (C) 2011 Uwe Hermann <uwe@hermann-uwe.de>
- * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -53,16 +53,16 @@ static int init(struct sr_output *o)
 
 	ctx->num_samples = 0;
 	num_enabled_probes = 0;
-	for (l = o->device->probes; l; l = l->next) {
+	for (l = o->dev->probes; l; l = l->next) {
 		probe = l->data;
 		if (probe->enabled)
 			num_enabled_probes++;
 	}
 	ctx->unitsize = (num_enabled_probes + 7) / 8;
 
-	if (o->device->plugin && sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE))
-		samplerate = *((uint64_t *) o->device->plugin->get_device_info(
-				o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
+	if (o->dev->driver && sr_dev_has_hwcap(o->dev, SR_HWCAP_SAMPLERATE))
+		samplerate = *((uint64_t *) o->dev->driver->dev_info_get(
+				o->dev->driver_index, SR_DI_CUR_SAMPLERATE));
 	else
 		samplerate = 0;
 
@@ -85,7 +85,7 @@ static int event(struct sr_output *o, int event_type, char **data_out,
 
 	if (ctx && event_type == SR_DF_END) {
 		g_string_free(ctx->header, TRUE);
-		free(o->internal);
+		g_free(o->internal);
 		o->internal = NULL;
 	}
 
@@ -124,7 +124,7 @@ static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
 	return SR_OK;
 }
 
-struct sr_output_format output_ols = {
+SR_PRIV struct sr_output_format output_ols = {
 	.id = "ols",
 	.description = "OpenBench Logic Sniffer",
 	.df_type = SR_DF_LOGIC,