X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_driver.c;h=fd5b11fc55cab186aa6e6d3ccd034811e2e4c965;hb=25a605d187e9661757a1e5d4bd15fac2b533c296;hp=b69cf2435015a193024457c7e44bb1d7cdc0b6bf;hpb=b08024a8363c7a019bebc05a25e2689e774326e8;p=libsigrok.git

diff --git a/session_driver.c b/session_driver.c
index b69cf243..fd5b11fc 100644
--- a/session_driver.c
+++ b/session_driver.c
@@ -60,18 +60,19 @@ static struct session_vdevice *get_vdevice_by_index(int device_index)
 	return vdevice;
 }
 
-static int feed_chunk(int fd, int revents, void *user_data)
+static int feed_chunk(int fd, int revents, void *session_data)
 {
 	struct sr_device_instance *sdi;
 	struct session_vdevice *vdevice;
 	struct sr_datafeed_packet packet;
+	struct sr_datafeed_logic logic;
 	GSList *l;
 	void *buf;
 	int ret, got_data;
 
-	/* avoid compiler warning */
-	fd = fd;
-	revents = revents;
+	/* Avoid compiler warnings. */
+	(void)fd;
+	(void)revents;
 
 	sr_dbg("session_driver: feed chunk");
 
@@ -83,15 +84,23 @@ static int feed_chunk(int fd, int revents, void *user_data)
 			/* already done with this instance */
 			continue;
 
-		buf = g_malloc(CHUNKSIZE);
+		if (!(buf = g_try_malloc(CHUNKSIZE))) {
+			sr_err("session: %s: buf malloc failed", __func__);
+			// return SR_ERR_MALLOC;
+			return FALSE;
+		}
+
 		ret = zip_fread(vdevice->capfile, buf, CHUNKSIZE);
 		if (ret > 0) {
 			got_data = TRUE;
 			packet.type = SR_DF_LOGIC;
-			packet.length = ret;
-			packet.unitsize = vdevice->unitsize;
-			packet.payload = buf;
-			sr_session_bus(user_data, &packet);
+			packet.timeoffset = 0;
+			packet.duration = 0;
+			packet.payload = &logic;
+			logic.length = ret;
+			logic.unitsize = vdevice->unitsize;
+			logic.data = buf;
+			sr_session_bus(session_data, &packet);
 		} else {
 			/* done with this capture file */
 			zip_fclose(vdevice->capfile);
@@ -103,17 +112,18 @@ static int feed_chunk(int fd, int revents, void *user_data)
 
 	if (!got_data) {
 		packet.type = SR_DF_END;
-		packet.length = 0;
-		sr_session_bus(user_data, &packet);
+		sr_session_bus(session_data, &packet);
 	}
 
 	return TRUE;
 }
 
 /* driver callbacks */
+static void hw_cleanup(void);
 
 static int hw_init(const char *deviceinfo)
 {
+	hw_cleanup();
 
 	sessionfile = g_strdup(deviceinfo);
 
@@ -127,6 +137,11 @@ static void hw_cleanup(void)
 	for (l = device_instances; l; l = l->next)
 		sr_device_instance_free(l->data);
 
+	g_slist_free(device_instances);
+	device_instances = NULL;
+
+	sr_session_source_remove(-1);
+
 	g_free(sessionfile);
 
 }
@@ -139,9 +154,12 @@ static int hw_opendev(int device_index)
 		NULL, NULL, NULL);
 	if (!sdi)
 		return SR_ERR;
-	sdi->priv = g_malloc0(sizeof(struct session_vdevice));
-	if (!sdi->priv)
-		return SR_ERR;
+
+	if (!(sdi->priv = g_try_malloc0(sizeof(struct session_vdevice)))) {
+		sr_err("session: %s: sdi->priv malloc failed", __func__);
+		return SR_ERR_MALLOC;
+	}
+
 	device_instances = g_slist_append(device_instances, sdi);
 
 	return SR_OK;
@@ -165,9 +183,8 @@ static void *hw_get_device_info(int device_index, int device_info_id)
 
 static int hw_get_status(int device_index)
 {
-
-	/* avoid compiler warning */
-	device_index = device_index;
+	/* Avoid compiler warnings. */
+	(void)device_index;
 
 	if (devices)
 		return SR_OK;
@@ -220,8 +237,8 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	struct sr_datafeed_packet *packet;
 	int err;
 
-	/* avoid compiler warning */
-	session_device_id = session_device_id;
+	/* Avoid compiler warnings. */
+	(void)session_device_id;
 
 	if (!(vdevice = get_vdevice_by_index(device_index)))
 		return SR_ERR;
@@ -250,18 +267,22 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	/* freewheeling source */
 	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__);
+		return SR_ERR_MALLOC;
+	}
+
+	if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) {
+		sr_err("session: %s: header malloc failed", __func__);
+		return SR_ERR_MALLOC;
+	}
+
 	/* Send header packet to the session bus. */
-	packet = g_malloc(sizeof(struct sr_datafeed_packet));
-	header = g_malloc(sizeof(struct sr_datafeed_header));
-	if (!packet || !header)
-		return SR_ERR;
 	packet->type = SR_DF_HEADER;
-	packet->length = sizeof(struct sr_datafeed_header);
 	packet->payload = (unsigned char *)header;
 	header->feed_version = 1;
 	gettimeofday(&header->starttime, NULL);
-	header->samplerate = 0;
-	header->protocol_id = SR_PROTO_RAW;
+	header->samplerate = vdevice->samplerate;
 	header->num_logic_probes = vdevice->num_probes;
 	header->num_analog_probes = 0;
 	sr_session_bus(session_device_id, packet);
@@ -271,7 +292,6 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	return SR_OK;
 }
 
-
 struct sr_device_plugin session_driver = {
 	"session",
 	"Session-emulating driver",