X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=input%2Finput_binary.c;h=be67f2d2d33767e8f9b59f5ee7356d38197193b0;hb=218557b85a308adc6ac533eb3f33d3dee17c13f8;hp=8160c7c1046d919037c3f936d31633bdab3b475a;hpb=b9c735a275512ce82da7f66275c7cb62eaf66b60;p=libsigrok.git

diff --git a/input/input_binary.c b/input/input_binary.c
index 8160c7c1..be67f2d2 100644
--- a/input/input_binary.c
+++ b/input/input_binary.c
@@ -51,7 +51,7 @@ 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, num_probes);
 
 	return SR_OK;
 }
@@ -72,28 +72,28 @@ 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 = PROTO_RAW;
+	header.protocol_id = SR_PROTO_RAW;
 	header.samplerate = 0;
 	gettimeofday(&header.starttime, NULL);
-	packet.type = DF_HEADER;
+	packet.type = SR_DF_HEADER;
 	packet.length = sizeof(struct sr_datafeed_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.type = SR_DF_LOGIC;
 	packet.unitsize = (num_probes + 7) / 8;
 	packet.payload = buffer;
 	while ((size = read(fd, buffer, CHUNKSIZE)) > 0) {
 		packet.length = size;
-		session_bus(in->vdevice, &packet);
+		sr_session_bus(in->vdevice, &packet);
 	}
 	close(fd);
 
 	/* end of stream */
-	packet.type = DF_END;
+	packet.type = SR_DF_END;
 	packet.length = 0;
-	session_bus(in->vdevice, &packet);
+	sr_session_bus(in->vdevice, &packet);
 
 	return SR_OK;
 }