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;
}
-static int init(struct input *in)
+static int init(struct sr_input *in)
{
int num_probes;
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;
}
-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;
- 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)
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 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 input_format input_binary = {
- "binary",
- "Raw binary",
- format_match,
- init,
- loadfile,
+struct sr_input_format input_binary = {
+ .id = "binary",
+ .description = "Raw binary",
+ .format_match = format_match,
+ .init = init,
+ .loadfile = loadfile,
};