X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_driver.c;h=fa1b9065dac8c381744a97cff728b0127bd8fcef;hb=54ac5277c5e462f1778300b9bc3fdd4709ecb2dc;hp=1bc430d522033bc6570551567e9d27370c17d6b5;hpb=b8c2f85f561a3e2738b621a0d42e0c066c1fcee9;p=libsigrok.git

diff --git a/session_driver.c b/session_driver.c
index 1bc430d5..fa1b9065 100644
--- a/session_driver.c
+++ b/session_driver.c
@@ -90,7 +90,7 @@ static int feed_chunk(int fd, int revents, void *user_data)
 			packet.length = ret;
 			packet.unitsize = vdevice->unitsize;
 			packet.payload = buf;
-			session_bus(user_data, &packet);
+			sr_session_bus(user_data, &packet);
 		} else {
 			/* done with this capture file */
 			zip_fclose(vdevice->capfile);
@@ -103,7 +103,7 @@ static int feed_chunk(int fd, int revents, void *user_data)
 	if (!got_data) {
 		packet.type = SR_DF_END;
 		packet.length = 0;
-		session_bus(user_data, &packet);
+		sr_session_bus(user_data, &packet);
 	}
 
 	return TRUE;
@@ -111,7 +111,7 @@ static int feed_chunk(int fd, int revents, void *user_data)
 
 /* driver callbacks */
 
-static int hw_init(char *deviceinfo)
+static int hw_init(const char *deviceinfo)
 {
 
 	sessionfile = g_strdup(deviceinfo);
@@ -247,7 +247,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	}
 
 	/* freewheeling source */
-	session_source_add(-1, 0, 0, feed_chunk, session_device_id);
+	sr_session_source_add(-1, 0, 0, feed_chunk, session_device_id);
 
 	/* Send header packet to the session bus. */
 	packet = g_malloc(sizeof(struct sr_datafeed_packet));
@@ -263,7 +263,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	header->protocol_id = SR_PROTO_RAW;
 	header->num_logic_probes = vdevice->num_probes;
 	header->num_analog_probes = 0;
-	session_bus(session_device_id, packet);
+	sr_session_bus(session_device_id, packet);
 	g_free(header);
 	g_free(packet);
 
@@ -284,5 +284,5 @@ struct sr_device_plugin session_driver = {
 	hw_get_capabilities,
 	hw_set_configuration,
 	hw_start_acquisition,
-	NULL
+	NULL,
 };