Move the probe naming to the creator of the device, and let each driver name its...

[libsigrok.git] / input / input_binary.c

diff --git a/input/input_binary.c b/input/input_binary.c
index 3f3db0b06e7aa8b56e6a2e7ab87384e8ab640520..fd23bfc1b3898cd71d4dc5be2db35afa47b4de2f 100644 (file)
--- a/input/input_binary.c
+++ b/input/input_binary.c
@@ -28,12 +28,10 @@
 #define CHUNKSIZE          4096
 #define DEFAULT_NUM_PROBES    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;
@@ -41,7 +39,8 @@ static int format_match(const char *filename)
 
 static int init(struct sr_input *in)
 {
-       int num_probes;
+       int num_probes, i;
+       char name[SR_MAX_PROBENAME_LEN];
 
        if (in->param && in->param[0]) {
                num_probes = strtoul(in->param, NULL, 10);
@@ -51,7 +50,13 @@ 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);
+
+       for (i = 0; i < num_probes; i++)
+       {
+               snprintf(name, SR_MAX_PROBENAME_LEN, "%d", i);
+               sr_device_probe_add(in->vdevice, name); /* TODO: Check return value. */
+       }
 
        return SR_OK;
 }
@@ -60,7 +65,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 +78,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 = SR_PROTO_RAW;
        header.samplerate = 0;
        gettimeofday(&header.starttime, NULL);
        packet.type = SR_DF_HEADER;
-       packet.length = sizeof(struct sr_datafeed_header);
        packet.payload = &header;
        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;
-       packet.unitsize = (num_probes + 7) / 8;
-       packet.payload = buffer;
+       packet.payload = &logic;
+       logic.unitsize = (num_probes + 7) / 8;
+       logic.data = buffer;
        while ((size = read(fd, buffer, CHUNKSIZE)) > 0) {
-               packet.length = size;
+               logic.length = size;
                sr_session_bus(in->vdevice, &packet);
        }
        close(fd);
 
        /* end of stream */
        packet.type = SR_DF_END;
-       packet.length = 0;
        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,
 };