X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_driver.c;h=7d2b9bda85fd77ec251cc5dbe28b5e5481e7ca2f;hb=7b48d6e104fd461b0c12519b70dbd1c6c72824e1;hp=f1c01918222e6827d1f14bd7529d5a5f4be9551b;hpb=c73d2ea421c2b425c3f0ae33bce2bfd0c448ca5f;p=libsigrok.git

diff --git a/session_driver.c b/session_driver.c
index f1c01918..7d2b9bda 100644
--- a/session_driver.c
+++ b/session_driver.c
@@ -59,7 +59,7 @@ static struct session_vdevice *get_vdevice_by_index(int device_index)
 
 	/* TODO: Sanity checks on device_index. */
 
-	if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
+	if (!(sdi = sr_dev_inst_get(device_instances, device_index))) {
 		sr_err("session driver: %s: device instance with device "
 		       "index %d was not found", __func__, device_index);
 		return NULL;
@@ -106,7 +106,8 @@ static int feed_chunk(int fd, int revents, void *session_data)
 			continue;
 
 		if (!(buf = g_try_malloc(CHUNKSIZE))) {
-			sr_err("session: %s: buf malloc failed", __func__);
+			sr_err("session driver: %s: buf malloc failed",
+			       __func__);
 			return FALSE; /* TODO: SR_ERR_MALLOC */
 		}
 
@@ -138,7 +139,7 @@ static int feed_chunk(int fd, int revents, void *session_data)
 }
 
 /* driver callbacks */
-static void hw_cleanup(void);
+static int hw_cleanup(void);
 
 /**
  * TODO.
@@ -149,7 +150,6 @@ static void hw_cleanup(void);
  */
 static int hw_init(const char *deviceinfo)
 {
-
 	sessionfile = g_strdup(deviceinfo);
 
 	return 0;
@@ -159,32 +159,33 @@ static int hw_init(const char *deviceinfo)
  * TODO.
  *
  */
-static void hw_cleanup(void)
+static int hw_cleanup(void)
 {
 	GSList *l;
 
 	for (l = device_instances; l; l = l->next)
-		sr_device_instance_free(l->data);
-
+		sr_dev_inst_free(l->data);
 	g_slist_free(device_instances);
 	device_instances = NULL;
 
 	sr_session_source_remove(-1);
 
 	g_free(sessionfile);
+
+	return SR_OK;
 }
 
 static int hw_opendev(int device_index)
 {
 	struct sr_device_instance *sdi;
 
-	sdi = sr_device_instance_new(device_index, SR_ST_INITIALIZING,
-		NULL, NULL, NULL);
+	sdi = sr_dev_inst_new(device_index, SR_ST_INITIALIZING,
+			      NULL, NULL, NULL);
 	if (!sdi)
 		return SR_ERR;
 
 	if (!(sdi->priv = g_try_malloc0(sizeof(struct session_vdevice)))) {
-		sr_err("session: %s: sdi->priv malloc failed", __func__);
+		sr_err("session driver: %s: sdi->priv malloc failed", __func__);
 		return SR_ERR_MALLOC;
 	}
 
@@ -286,21 +287,21 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 		vdevice->capturefile);
 
 	if (!(vdevice->archive = zip_open(sessionfile, 0, &err))) {
-		sr_err("Failed to open session file '%s': zip error %d\n",
-		       sessionfile, err);
+		sr_err("session driver: 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) {
-		sr_err("Failed to check capture file '%s' in session file "
-		       "'%s'.", vdevice->capturefile, sessionfile);
+		sr_err("session driver: 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))) {
-		sr_err("Failed to open capture file '%s' in session file '%s'.",
-		       vdevice->capturefile, sessionfile);
+		sr_err("session driver: Failed to open capture file '%s' in "
+		       "session file '%s'.", vdevice->capturefile, sessionfile);
 		return SR_ERR;
 	}
 
@@ -308,12 +309,12 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	sr_session_source_add(-1, 0, 0, feed_chunk, session_device_id);
 
 	if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) {
-		sr_err("session: %s: packet malloc failed", __func__);
+		sr_err("session driver: %s: packet malloc failed", __func__);
 		return SR_ERR_MALLOC;
 	}
 
 	if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) {
-		sr_err("session: %s: header malloc failed", __func__);
+		sr_err("session driver: %s: header malloc failed", __func__);
 		return SR_ERR_MALLOC;
 	}