X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=input%2Fbinary.c;h=9a87d3e2cf929dd0e340543fd04cfe232e2dabc5;hb=bb7ef79377ae617e1275373e0b631beb7f909d73;hp=50f7f501820382031307ca4412eea28cfa49a1ad;hpb=d68e2d1a21ac5c3f24d88b7689f98764e4d57c30;p=libsigrok.git diff --git a/input/binary.c b/input/binary.c index 50f7f501..9a87d3e2 100644 --- a/input/binary.c +++ b/input/binary.c @@ -52,12 +52,12 @@ static int init(struct sr_input *in) } /* Create a virtual device. */ - in->vdevice = sr_dev_new(NULL, 0); + in->vdev = sr_dev_new(NULL, 0); for (i = 0; i < num_probes; i++) { snprintf(name, SR_MAX_PROBENAME_LEN, "%d", i); /* TODO: Check return value. */ - sr_dev_probe_add(in->vdevice, name); + sr_dev_probe_add(in->vdev, name); } return SR_OK; @@ -74,7 +74,7 @@ static int loadfile(struct sr_input *in, const char *filename) if ((fd = open(filename, O_RDONLY)) == -1) return SR_ERR; - num_probes = g_slist_length(in->vdevice->probes); + num_probes = g_slist_length(in->vdev->probes); /* send header */ header.feed_version = 1; @@ -83,7 +83,7 @@ static int loadfile(struct sr_input *in, const char *filename) gettimeofday(&header.starttime, NULL); packet.type = SR_DF_HEADER; packet.payload = &header; - sr_session_bus(in->vdevice, &packet); + sr_session_bus(in->vdev, &packet); /* chop up the input file into chunks and feed it into the session bus */ packet.type = SR_DF_LOGIC; @@ -92,13 +92,13 @@ static int loadfile(struct sr_input *in, const char *filename) logic.data = buffer; while ((size = read(fd, buffer, CHUNKSIZE)) > 0) { logic.length = size; - sr_session_bus(in->vdevice, &packet); + sr_session_bus(in->vdev, &packet); } close(fd); /* end of stream */ packet.type = SR_DF_END; - sr_session_bus(in->vdevice, &packet); + sr_session_bus(in->vdev, &packet); return SR_OK; }