X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fcsv.c;h=cc22eb84bd9538052802a0f83c4d2f334935d00a;hb=31ccebc4925d245fed02545415ce3ee14055d897;hp=18d5c420bb406235f979c356600e1213f78fc1af;hpb=bb7ef79377ae617e1275373e0b631beb7f909d73;p=libsigrok.git diff --git a/output/csv.c b/output/csv.c index 18d5c420..cc22eb84 100644 --- a/output/csv.c +++ b/output/csv.c @@ -66,8 +66,8 @@ static int init(struct sr_output *o) return SR_ERR_ARG; } - if (!o->dev->plugin) { - sr_err("csv out: %s: o->dev->plugin was NULL", __func__); + if (!o->dev->driver) { + sr_err("csv out: %s: o->dev->driver was NULL", __func__); return SR_ERR_ARG; } @@ -92,8 +92,8 @@ static int init(struct sr_output *o) num_probes = g_slist_length(o->dev->probes); if (sr_dev_has_hwcap(o->dev, SR_HWCAP_SAMPLERATE)) { - samplerate = *((uint64_t *) o->dev->plugin->get_dev_info( - o->dev->plugin_index, SR_DI_CUR_SAMPLERATE)); + samplerate = *((uint64_t *) o->dev->driver->dev_info_get( + o->dev->driver_index, SR_DI_CUR_SAMPLERATE)); /* TODO: Error checks. */ } else { samplerate = 0; /* TODO: Error or set some value? */