X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=input%2Finput_binary.c;h=8160c7c1046d919037c3f936d31633bdab3b475a;hb=5c2d46d1dbfa636fb3cdbeaffdc0e9ca77c66ee1;hp=7581341adf058aa0bb381e248ee967c3786e14c6;hpb=e46b8fb154ba90ffec9c1f805399dfa819e736f9;p=libsigrok.git

diff --git a/input/input_binary.c b/input/input_binary.c
index 7581341a..8160c7c1 100644
--- a/input/input_binary.c
+++ b/input/input_binary.c
@@ -39,7 +39,7 @@ static int format_match(const char *filename)
 	return TRUE;
 }
 
-static int init(struct input *in)
+static int init(struct sr_input *in)
 {
 	int num_probes;
 
@@ -56,10 +56,10 @@ static int init(struct input *in)
 	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;
+	struct sr_datafeed_header header;
+	struct sr_datafeed_packet packet;
 	char buffer[CHUNKSIZE];
 	int fd, size, num_probes;
 
@@ -76,7 +76,7 @@ static int loadfile(struct input *in, const char *filename)
 	header.samplerate = 0;
 	gettimeofday(&header.starttime, NULL);
 	packet.type = DF_HEADER;
-	packet.length = sizeof(struct datafeed_header);
+	packet.length = sizeof(struct sr_datafeed_header);
 	packet.payload = &header;
 	session_bus(in->vdevice, &packet);
 
@@ -98,7 +98,7 @@ static int loadfile(struct input *in, const char *filename)
 	return SR_OK;
 }
 
-struct input_format input_binary = {
+struct sr_input_format input_binary = {
 	"binary",
 	"Raw binary",
 	format_match,