X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=input%2Finput_binary.c;h=b83ea6f5ea58ed46aad482c19031f2b47fe94416;hb=3b7c8f54fcf4c6de1ec67d11a9ec8975a2ddbb57;hp=2f1462d07dc5f9424e34bd308d35224c9466ef31;hpb=c2616fb9faca19945154974884a0816359cec1df;p=libsigrok.git
diff --git a/input/input_binary.c b/input/input_binary.c
index 2f1462d0..b83ea6f5 100644
--- a/input/input_binary.c
+++ b/input/input_binary.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
@@ -24,59 +25,88 @@
#include
#include
-#define CHUNKSIZE 4096
+#define CHUNKSIZE 4096
+#define DEFAULT_NUM_PROBES 8
static int format_match(const char *filename)
{
- filename = NULL;
+ /* suppress compiler warning */
+ (void)filename;
+
+ /* this module will handle anything you throw at it */
return TRUE;
}
-static int in_loadfile(const char *filename)
+static int init(struct sr_input *in)
+{
+ int num_probes, i;
+ char name[SR_MAX_PROBENAME_LEN + 1];
+
+ 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);
+ /* TODO: Check return value. */
+ sr_device_probe_add(in->vdevice, name);
+ }
+
+ 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;
+ return SR_ERR;
- /* TODO: Number of probes is 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_logic_probes = num_probes;
- header.num_analog_probes = 0; /* FIXME */
- header.protocol_id = PROTO_RAW;
+ 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);
+ sr_session_bus(in->vdevice, &packet);
- packet.type = DF_LOGIC;
- packet.unitsize = 1;
- packet.payload = buffer;
+ /* 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) {
- packet.length = size;
- session_bus(device, &packet);
+ 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,
};