X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=b2f3a50915227ee4b96cd4b9dd7d45b2a0a1262f;hb=102f12396660e0784134bccce5cc0679db325751;hp=07ae253aa40f189e391029bc00ee70290ad379e0;hpb=3f239f0803b9fbc073dd7abe9fc7b2a0c606fbb6;p=libsigrok.git

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 07ae253a..b2f3a509 100644
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -50,7 +50,7 @@ enum {
 	/**
 	 * Spells "sigrok" across 8 channels using '0's (with '1's as
 	 * "background") when displayed using the 'bits' output format.
-	 * The pattern is repeasted every 8 channels, shifted to the right
+	 * The pattern is repeated every 8 channels, shifted to the right
 	 * in time by one bit.
 	 */
 	PATTERN_SIGROK,
@@ -59,7 +59,7 @@ enum {
 	PATTERN_RANDOM,
 
 	/**
-	 * Incrementing number across 8 channels. The pattern is repeasted
+	 * Incrementing number across 8 channels. The pattern is repeated
 	 * every 8 channels, shifted to the right in time by one bit.
 	 */
 	PATTERN_INC,
@@ -692,6 +692,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	GSList *l;
 	struct dev_context *devc;
 
+	(void)cb_data;
+
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
@@ -726,11 +728,11 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	/* Make channels to unbuffered. */
 	g_io_channel_set_buffered(devc->channel, FALSE);
 
-	sr_session_source_add_channel(devc->channel, G_IO_IN | G_IO_ERR,
+	sr_session_source_add_channel(sdi->session, devc->channel, G_IO_IN | G_IO_ERR,
 			40, prepare_data, (void *)sdi);
 
 	/* Send header packet to the session bus. */
-	std_session_send_df_header(cb_data, LOG_PREFIX);
+	std_session_send_df_header(sdi, LOG_PREFIX);
 
 	/* We use this timestamp to decide how many more samples to send. */
 	devc->starttime = g_get_monotonic_time();
@@ -748,7 +750,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 	devc = sdi->priv;
 	sr_dbg("Stopping acquisition.");
 
-	sr_session_source_remove_channel(devc->channel);
+	sr_session_source_remove_channel(sdi->session, devc->channel);
 	g_io_channel_shutdown(devc->channel, FALSE, NULL);
 	g_io_channel_unref(devc->channel);
 	devc->channel = NULL;