Add sr_ prefix to session related API functions.

[libsigrok.git] / input / input_binary.c

diff --git a/input/input_binary.c b/input/input_binary.c
index 7581341adf058aa0bb381e248ee967c3786e14c6..3f3db0b06e7aa8b56e6a2e7ab87384e8ab640520 100644 (file)
--- a/input/input_binary.c
+++ b/input/input_binary.c
@@ -39,7 +39,7 @@ 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;
 
@@ -56,10 +56,10 @@ static int init(struct input *in)
        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;
 
@@ -72,33 +72,33 @@ 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 SR_OK;
 }
 
-struct input_format input_binary = {
+struct sr_input_format input_binary = {
        "binary",
        "Raw binary",
        format_match,