input/output formats: Explicit struct member names.

[libsigrok.git] / input / input_binary.c

diff --git a/input/input_binary.c b/input/input_binary.c
index 1da4e7014d3896380e14f212d46965eaf73ea2a1..e89dc84c1ed6f4d839a2a062154a18bbe4c169d1 100644 (file)
--- a/input/input_binary.c
+++ b/input/input_binary.c
@@ -51,7 +51,7 @@ static int init(struct sr_input *in)
                num_probes = DEFAULT_NUM_PROBES;
 
        /* create a virtual device */
-       in->vdevice = device_new(NULL, 0, num_probes);
+       in->vdevice = sr_device_new(NULL, 0, num_probes);
 
        return SR_OK;
 }
@@ -78,7 +78,7 @@ static int loadfile(struct sr_input *in, const char *filename)
        packet.type = SR_DF_HEADER;
        packet.length = sizeof(struct sr_datafeed_header);
        packet.payload = &header;
-       session_bus(in->vdevice, &packet);
+       sr_session_bus(in->vdevice, &packet);
 
        /* chop up the input file into chunks and feed it into the session bus */
        packet.type = SR_DF_LOGIC;
@@ -86,22 +86,22 @@ static int loadfile(struct sr_input *in, const char *filename)
        packet.payload = buffer;
        while ((size = read(fd, buffer, CHUNKSIZE)) > 0) {
                packet.length = size;
-               session_bus(in->vdevice, &packet);
+               sr_session_bus(in->vdevice, &packet);
        }
        close(fd);
 
        /* end of stream */
        packet.type = SR_DF_END;
        packet.length = 0;
-       session_bus(in->vdevice, &packet);
+       sr_session_bus(in->vdevice, &packet);
 
        return SR_OK;
 }
 
 struct sr_input_format input_binary = {
-       "binary",
-       "Raw binary",
-       format_match,
-       init,
-       loadfile,
+       .extension = "binary",
+       .description = "Raw binary",
+       .format_match = format_match,
+       .init = init,
+       .loadfile = loadfile,
 };