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

diff --git a/session_driver.c b/session_driver.c
index 1bc430d5..b69cf243 100644
--- a/session_driver.c
+++ b/session_driver.c
@@ -24,6 +24,7 @@
 #include <sys/time.h>
 #include <zip.h>
 #include <sigrok.h>
+#include <sigrok-internal.h>
 
 /* size of payloads sent across the session bus */
 #define CHUNKSIZE 4096
@@ -72,7 +73,7 @@ static int feed_chunk(int fd, int revents, void *user_data)
 	fd = fd;
 	revents = revents;
 
-	g_debug("session_driver: feed chunk");
+	sr_dbg("session_driver: feed chunk");
 
 	got_data = FALSE;
 	for (l = device_instances; l; l = l->next) {
@@ -90,7 +91,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 +104,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 +112,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);
@@ -225,29 +226,29 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	if (!(vdevice = get_vdevice_by_index(device_index)))
 		return SR_ERR;
 
-	g_message("session_driver: opening archive %s file %s",
-			sessionfile, vdevice->capturefile);
+	sr_info("session_driver: opening archive %s file %s", sessionfile,
+		vdevice->capturefile);
 
 	if (!(vdevice->archive = zip_open(sessionfile, 0, &err))) {
-		g_warning("Failed to open session file '%s': zip error %d\n",
-				sessionfile, err);
+		sr_warn("Failed to open session file '%s': zip error %d\n",
+			sessionfile, err);
 		return SR_ERR;
 	}
 
 	if (zip_stat(vdevice->archive, vdevice->capturefile, 0, &zs) == -1) {
-		g_warning("Failed to check capture file '%s' in session file '%s'.",
-				vdevice->capturefile, sessionfile);
+		sr_warn("Failed to check capture file '%s' in session file '%s'.",
+			vdevice->capturefile, sessionfile);
 		return SR_ERR;
 	}
 
 	if (!(vdevice->capfile = zip_fopen(vdevice->archive, vdevice->capturefile, 0))) {
-		g_warning("Failed to open capture file '%s' in session file '%s'.",
-				vdevice->capturefile, sessionfile);
+		sr_warn("Failed to open capture file '%s' in session file '%s'.",
+			vdevice->capturefile, sessionfile);
 		return SR_ERR;
 	}
 
 	/* 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 +264,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 +285,5 @@ struct sr_device_plugin session_driver = {
 	hw_get_capabilities,
 	hw_set_configuration,
 	hw_start_acquisition,
-	NULL
+	NULL,
 };