Fix some compiler warnings.

[libsigrok.git] / input / input_binary.c

diff --git a/input/input_binary.c b/input/input_binary.c
index 8160c7c1046d919037c3f936d31633bdab3b475a..4286a6c3459a1bcd5eaf7e1be1b863f8159be4dd 100644 (file)
--- a/input/input_binary.c
+++ b/input/input_binary.c
@@ -31,9 +31,8 @@
 
 static int format_match(const char *filename)
 {
-
        /* suppress compiler warning */
-       filename = NULL;
+       (void)filename;
 
        /* this module will handle anything you throw at it */
        return TRUE;
@@ -51,7 +50,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;
 }
@@ -60,7 +59,8 @@ static int loadfile(struct sr_input *in, const char *filename)
 {
        struct sr_datafeed_header header;
        struct sr_datafeed_packet packet;
-       char buffer[CHUNKSIZE];
+       struct sr_datafeed_logic logic;
+       unsigned char buffer[CHUNKSIZE];
        int fd, size, num_probes;
 
        if ((fd = open(filename, O_RDONLY)) == -1)
@@ -72,36 +72,34 @@ static int loadfile(struct sr_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.samplerate = 0;
        gettimeofday(&header.starttime, NULL);
-       packet.type = DF_HEADER;
-       packet.length = sizeof(struct sr_datafeed_header);
+       packet.type = SR_DF_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.unitsize = (num_probes + 7) / 8;
-       packet.payload = buffer;
+       packet.type = SR_DF_LOGIC;
+       packet.payload = &logic;
+       logic.unitsize = (num_probes + 7) / 8;
+       logic.data = buffer;
        while ((size = read(fd, buffer, CHUNKSIZE)) > 0) {
-               packet.length = size;
-               session_bus(in->vdevice, &packet);
+               logic.length = size;
+               sr_session_bus(in->vdevice, &packet);
        }
        close(fd);
 
        /* end of stream */
-       packet.type = DF_END;
-       packet.length = 0;
-       session_bus(in->vdevice, &packet);
+       packet.type = SR_DF_END;
+       sr_session_bus(in->vdevice, &packet);
 
        return SR_OK;
 }
 
 struct sr_input_format input_binary = {
-       "binary",
-       "Raw binary",
-       format_match,
-       init,
-       loadfile,
+       .id = "binary",
+       .description = "Raw binary",
+       .format_match = format_match,
+       .init = init,
+       .loadfile = loadfile,
 };