X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=output%2Fvcd.c;h=91f72c1377a63af1c24b010aa4efef1f401a1425;hb=c8f2c9dda4027fe723aabccb4265629c374afcd9;hp=698c65aef8343d5bf30b4353346226d60f7ec818;hpb=7b48d6e104fd461b0c12519b70dbd1c6c72824e1;p=libsigrok.git

diff --git a/output/vcd.c b/output/vcd.c
index 698c65ae..91f72c13 100644
--- a/output/vcd.c
+++ b/output/vcd.c
@@ -57,7 +57,7 @@ static int init(struct sr_output *o)
 	o->internal = ctx;
 	ctx->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)
 			continue;
@@ -71,7 +71,7 @@ static int init(struct sr_output *o)
 	ctx->probelist[ctx->num_enabled_probes] = 0;
 	ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
 	ctx->header = g_string_sized_new(512);
-	num_probes = g_slist_length(o->device->probes);
+	num_probes = g_slist_length(o->dev->probes);
 
 	/* timestamp */
 	t = time(NULL);
@@ -84,9 +84,9 @@ static int init(struct sr_output *o)
 	g_string_append_printf(ctx->header, "$version %s %s $end\n",
 			PACKAGE, PACKAGE_VERSION);
 
-	if (o->device->plugin && sr_dev_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
-		ctx->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)) {
+		ctx->samplerate = *((uint64_t *) o->dev->driver->dev_info_get(
+				o->dev->driver_index, SR_DI_CUR_SAMPLERATE));
 		if (!((samplerate_s = sr_samplerate_string(ctx->samplerate)))) {
 			g_string_free(ctx->header, TRUE);
 			g_free(ctx);
@@ -138,10 +138,8 @@ static int init(struct sr_output *o)
 static int event(struct sr_output *o, int event_type, char **data_out,
 		 uint64_t *length_out)
 {
-	struct context *ctx;
 	char *outbuf;
 
-	ctx = o->internal;
 	switch (event_type) {
 	case SR_DF_END:
 		outbuf = g_strdup("$dumpoff\n$end\n");