X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fols.c;h=2025249d6a350e9657be065fce8e82c776bdebf3;hb=aae2fed675fc63aae58569a03c71201dc449344b;hp=dff54a42d607abab3ad7d904551363a942311b04;hpb=133a37bfba1a7e1423716b2b872d3bb82a2e64d9;p=libsigrok.git

diff --git a/output/ols.c b/output/ols.c
index dff54a42..2025249d 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->plugin && sr_dev_has_hwcap(o->dev, SR_HWCAP_SAMPLERATE))
+		samplerate = *((uint64_t *) o->dev->plugin->dev_info_get(
+				o->dev->plugin_index, SR_DI_CUR_SAMPLERATE));
 	else
 		samplerate = 0;