sr: change input/output modules to use struct sr_dev_inst *

[libsigrok.git] / input / binary.c

diff --git a/input/binary.c b/input/binary.c
index 53c0ebb5bf2339793834df4e0c607ed181c0ca8d..8348ea82dd9870a6aa223c6fcc804dc5fe4ad0c2 100644 (file)
--- a/input/binary.c
+++ b/input/binary.c
@@ -44,6 +44,7 @@ static int format_match(const char *filename)
 
 static int init(struct sr_input *in)
 {
+       struct sr_probe *probe;
        int num_probes, i;
        char name[SR_MAX_PROBENAME_LEN + 1];
        char *param;
@@ -73,13 +74,15 @@ static int init(struct sr_input *in)
        }
 
        /* Create a virtual device. */
-       in->vdev = sr_dev_new(NULL, 0);
+       in->sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, NULL, NULL, NULL);
        in->internal = ctx;
 
        for (i = 0; i < num_probes; i++) {
                snprintf(name, SR_MAX_PROBENAME_LEN, "%d", i);
                /* TODO: Check return value. */
-               sr_dev_probe_add(in->vdev, name);
+               if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, name)))
+                       return SR_ERR;
+               in->sdi->probes = g_slist_append(in->sdi->probes, probe);
        }
 
        return SR_OK;
@@ -100,21 +103,21 @@ 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->vdev->probes);
+       num_probes = g_slist_length(in->sdi->probes);
 
        /* send header */
        header.feed_version = 1;
        gettimeofday(&header.starttime, NULL);
        packet.type = SR_DF_HEADER;
        packet.payload = &header;
-       sr_session_send(in->vdev, &packet);
+       sr_session_send(in->sdi, &packet);
 
        /* Send metadata about the SR_DF_LOGIC packets to come. */
        packet.type = SR_DF_META_LOGIC;
        packet.payload = &meta;
        meta.samplerate = ctx->samplerate;
        meta.num_probes = num_probes;
-       sr_session_send(in->vdev, &packet);
+       sr_session_send(in->sdi, &packet);
 
        /* chop up the input file into chunks and feed it into the session bus */
        packet.type = SR_DF_LOGIC;
@@ -123,13 +126,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_send(in->vdev, &packet);
+               sr_session_send(in->sdi, &packet);
        }
        close(fd);
 
        /* end of stream */
        packet.type = SR_DF_END;
-       sr_session_send(in->vdev, &packet);
+       sr_session_send(in->sdi, &packet);
 
        g_free(ctx);
        in->internal = NULL;