X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=cf8cef6ff9fdcb46e7fb76b6b6cd8395f5256301;hb=f086b83011b1282f62f0058872f333aef4bf9daa;hp=8f13b25c7d415ce801bdd50d7838fe5f08f39baa;hpb=de6e0eca95f5d89e12b0940f2ecf59ab563cb725;p=libsigrok.git

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 8f13b25c..cf8cef6f 100644
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de>
  * Copyright (C) 2011 Olivier Fauchon <olivier@aixmarseille.com>
+ * Copyright (C) 2012 Alexandru Gagniuc <mr.nuke.me@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -422,13 +423,8 @@ static int receive_data(int fd, int revents, void *cb_data)
 
 	if (!thread_running && z <= 0) {
 		/* Make sure we don't receive more packets. */
-		g_io_channel_shutdown(devc->channels[0], FALSE, NULL);
-
-		/* Send last packet. */
-		packet.type = SR_DF_END;
-		sr_session_send(devc->session_dev_id, &packet);
-
-		return FALSE;
+		hw_dev_acquisition_stop(NULL, cb_data);
+		return TRUE;
 	}
 
 	return TRUE;
@@ -444,6 +440,8 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 
 	(void)sdi;
 
+	sr_dbg("Starting acquisition.");
+
 	/* TODO: 'devc' is never g_free()'d? */
 	if (!(devc = g_try_malloc(sizeof(struct dev_context)))) {
 		sr_err("%s: devc malloc failed", __func__);
@@ -518,15 +516,23 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
 	struct dev_context *devc;
+	struct sr_datafeed_packet packet;
 
-	(void)cb_data;
+	(void)sdi;
+
+	devc = cb_data;
 
-	devc = sdi->priv;
+	sr_dbg("Stopping aquisition.");
 
 	/* Stop generate thread. */
 	thread_running = 0;
 
 	sr_session_source_remove_channel(devc->channels[0]);
+	g_io_channel_shutdown(devc->channels[0], FALSE, NULL);
+
+	/* Send last packet. */
+	packet.type = SR_DF_END;
+	sr_session_send(devc->session_dev_id, &packet);
 
 	return SR_OK;
 }