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 3957e7690854941b2092f46615b767c424810544..e89dc84c1ed6f4d839a2a062154a18bbe4c169d1 100644 (file)
--- a/input/input_binary.c
+++ b/input/input_binary.c
@@ -39,32 +39,32 @@ static int format_match(const char *filename)
        return TRUE;
 }
 
-static int init(struct input *in)
+static int init(struct sr_input *in)
 {
        int num_probes;
 
        if (in->param && in->param[0]) {
                num_probes = strtoul(in->param, NULL, 10);
                if (num_probes < 1)
-                       return SIGROK_ERR;
+                       return SR_ERR;
        } else
                num_probes = DEFAULT_NUM_PROBES;
 
        /* create a virtual device */
-       in->vdevice = device_new(NULL, 0, num_probes, PROBE_TYPE_LOGIC);
+       in->vdevice = sr_device_new(NULL, 0, num_probes);
 
-       return SIGROK_OK;
+       return SR_OK;
 }
 
-static int loadfile(struct input *in, const char *filename)
+static int loadfile(struct sr_input *in, const char *filename)
 {
-       struct datafeed_header header;
-       struct datafeed_packet packet;
+       struct sr_datafeed_header header;
+       struct sr_datafeed_packet packet;
        char buffer[CHUNKSIZE];
        int fd, size, num_probes;
 
        if ((fd = open(filename, O_RDONLY)) == -1)
-               return SIGROK_ERR;
+               return SR_ERR;
 
        num_probes = g_slist_length(in->vdevice->probes);
 
@@ -72,36 +72,36 @@ static int loadfile(struct input *in, const char *filename)
        header.feed_version = 1;
        header.num_logic_probes = num_probes;
        header.num_analog_probes = 0;
-       header.protocol_id = PROTO_RAW;
+       header.protocol_id = SR_PROTO_RAW;
        header.samplerate = 0;
        gettimeofday(&header.starttime, NULL);
-       packet.type = DF_HEADER;
-       packet.length = sizeof(struct datafeed_header);
+       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 = DF_LOGIC;
+       packet.type = SR_DF_LOGIC;
        packet.unitsize = (num_probes + 7) / 8;
        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 = DF_END;
+       packet.type = SR_DF_END;
        packet.length = 0;
-       session_bus(in->vdevice, &packet);
+       sr_session_bus(in->vdevice, &packet);
 
-       return SIGROK_OK;
+       return SR_OK;
 }
 
-struct input_format input_binary = {
-       "binary",
-       "Raw binary",
-       format_match,
-       init,
-       loadfile,
+struct sr_input_format input_binary = {
+       .extension = "binary",
+       .description = "Raw binary",
+       .format_match = format_match,
+       .init = init,
+       .loadfile = loadfile,
 };