X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fols.c;h=2025249d6a350e9657be065fce8e82c776bdebf3;hb=5097b0d0912165429aceddb5febbf68467b623f5;hp=7c98a8a9d4f900341bb937476563d6a675dc37ee;hpb=031685005b022b98b5b1604cc6226c0cc2b959f8;p=libsigrok.git diff --git a/output/ols.c b/output/ols.c index 7c98a8a9..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 - * Copyright (C) 2011 Bert Vermeulen + * Copyright (C) 2010-2012 Bert Vermeulen * * 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_dev_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;