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 27e8fa4d34a5b8d315575dafca51919b1436bb14..fd23bfc1b3898cd71d4dc5be2db35afa47b4de2f 100644 (file)
--- a/input/input_binary.c
+++ b/input/input_binary.c
@@ -17,72 +17,95 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/time.h>
-
 #include <sigrok.h>
 
-#define CHUNKSIZE 4096
-
+#define CHUNKSIZE          4096
+#define DEFAULT_NUM_PROBES    8
 
-static int format_match(char *filename)
+static int format_match(const char *filename)
 {
+       /* suppress compiler warning */
+       (void)filename;
 
-       filename = NULL;
-
+       /* this module will handle anything you throw at it */
        return TRUE;
 }
 
+static int init(struct sr_input *in)
+{
+       int num_probes, i;
+       char name[SR_MAX_PROBENAME_LEN];
+
+       if (in->param && in->param[0]) {
+               num_probes = strtoul(in->param, NULL, 10);
+               if (num_probes < 1)
+                       return SR_ERR;
+       } else
+               num_probes = DEFAULT_NUM_PROBES;
+
+       /* create a virtual device */
+       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. */
+       }
 
-static int in_loadfile(char *filename)
+       return SR_OK;
+}
+
+static int loadfile(struct sr_input *in, const char *filename)
 {
-       struct datafeed_header header;
-       struct datafeed_packet packet;
-       struct device *device;
-       char buffer[CHUNKSIZE];
+       struct sr_datafeed_header header;
+       struct sr_datafeed_packet packet;
+       struct sr_datafeed_logic logic;
+       unsigned char buffer[CHUNKSIZE];
        int fd, size, num_probes;
 
-       if( (fd = open(filename, O_RDONLY)) == -1)
-               return SIGROK_ERR;
+       if ((fd = open(filename, O_RDONLY)) == -1)
+               return SR_ERR;
 
-       /* TODO: number of probes hardcoded to 8 */
-       num_probes = 8;
-       device = device_new(NULL, 0, num_probes);
+       num_probes = g_slist_length(in->vdevice->probes);
 
+       /* send header */
        header.feed_version = 1;
-       header.num_probes = num_probes;
-       header.protocol_id = PROTO_RAW;
+       header.num_logic_probes = num_probes;
+       header.num_analog_probes = 0;
        header.samplerate = 0;
        gettimeofday(&header.starttime, NULL);
-       packet.type = DF_HEADER;
-       packet.length = sizeof(struct datafeed_header);
+       packet.type = SR_DF_HEADER;
        packet.payload = &header;
-       session_bus(device, &packet);
-
-       packet.type = DF_LOGIC8;
-       packet.payload = buffer;
-       while( (size = read(fd, buffer, CHUNKSIZE)) > 0) {
-               packet.length = size;
-               session_bus(device, &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;
+       packet.payload = &logic;
+       logic.unitsize = (num_probes + 7) / 8;
+       logic.data = buffer;
+       while ((size = read(fd, buffer, CHUNKSIZE)) > 0) {
+               logic.length = size;
+               sr_session_bus(in->vdevice, &packet);
        }
        close(fd);
 
-       packet.type = DF_END;
-       packet.length = 0;
-       session_bus(device, &packet);
-
+       /* end of stream */
+       packet.type = SR_DF_END;
+       sr_session_bus(in->vdevice, &packet);
 
-       return SIGROK_OK;
+       return SR_OK;
 }
 
-
-struct input_format input_binary = {
-               "binary",
-               "Raw binary",
-               format_match,
-               in_loadfile
+struct sr_input_format input_binary = {
+       .id = "binary",
+       .description = "Raw binary",
+       .format_match = format_match,
+       .init = init,
+       .loadfile = loadfile,
 };
-