X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=175e72630ab48f11bc6eda9e5c633956b15a55cf;hb=3a7a22cb07937fcecef8b17b25e9638245f7f8c1;hp=e511c0a6fac22340ee8a860cac571836ae0d0b22;hpb=a533743dd1680bb53f29b6a01cccbc5380027e77;p=libsigrok.git

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index e511c0a6..175e7263 100644
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -27,8 +27,8 @@
 #include <fcntl.h>
 #define pipe(fds) _pipe(fds, 4096, _O_BINARY)
 #endif
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 /* TODO: Number of probes should be configurable. */
 #define NUM_PROBES             8
@@ -64,10 +64,10 @@ enum {
 };
 
 /* FIXME: Should not be global. */
-SR_PRIV GIOChannel *channels[2];
 
 struct context {
 	int pipe_fds[2];
+	GIOChannel *channels[2];
 	uint8_t sample_generator;
 	uint8_t thread_running;
 	uint64_t samples_counter;
@@ -140,12 +140,17 @@ static int thread_running;
 
 static int hw_dev_acquisition_stop(int dev_index, void *cb_data);
 
-static int hw_init(const char *devinfo)
+static int hw_init(void)
 {
-	struct sr_dev_inst *sdi;
 
-	/* Avoid compiler warnings. */
-	(void)devinfo;
+	/* Nothing to do. */
+
+	return SR_OK;
+}
+
+static int hw_scan(void)
+{
+	struct sr_dev_inst *sdi;
 
 	sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, DEMONAME, NULL, NULL);
 	if (!sdi) {
@@ -248,12 +253,14 @@ static int hw_dev_config_set(int dev_index, int hwcap, const void *value)
 		       cur_samplerate);
 		ret = SR_OK;
 	} else if (hwcap == SR_HWCAP_LIMIT_SAMPLES) {
+		limit_msec = 0;
 		limit_samples = *(const uint64_t *)value;
 		sr_dbg("demo: %s: setting limit_samples to %" PRIu64, __func__,
 		       limit_samples);
 		ret = SR_OK;
 	} else if (hwcap == SR_HWCAP_LIMIT_MSEC) {
 		limit_msec = *(const uint64_t *)value;
+		limit_samples = 0;
 		sr_dbg("demo: %s: setting limit_msec to %" PRIu64, __func__,
 		       limit_msec);
 		ret = SR_OK;
@@ -352,7 +359,7 @@ static void thread_func(void *data)
 			samples_generator(buf, nb_to_send, data);
 			ctx->samples_counter += nb_to_send;
 
-			g_io_channel_write_chars(channels[1], (gchar *)&buf,
+			g_io_channel_write_chars(ctx->channels[1], (gchar *)&buf,
 				nb_to_send, (gsize *)&bytes_written, NULL);
 		}
 
@@ -371,6 +378,7 @@ static void thread_func(void *data)
 /* Callback handling data */
 static int receive_data(int fd, int revents, void *cb_data)
 {
+	struct context *ctx = cb_data;
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_logic logic;
 	static uint64_t samples_received = 0;
@@ -382,7 +390,7 @@ static int receive_data(int fd, int revents, void *cb_data)
 	(void)revents;
 
 	do {
-		g_io_channel_read_chars(channels[0],
+		g_io_channel_read_chars(ctx->channels[0],
 				        (gchar *)&c, BUFSIZE, &z, NULL);
 
 		if (z > 0) {
@@ -391,18 +399,18 @@ static int receive_data(int fd, int revents, void *cb_data)
 			logic.length = z;
 			logic.unitsize = 1;
 			logic.data = c;
-			sr_session_send(cb_data, &packet);
+			sr_session_send(ctx->session_dev_id, &packet);
 			samples_received += z;
 		}
 	} while (z > 0);
 
 	if (!thread_running && z <= 0) {
 		/* Make sure we don't receive more packets. */
-		g_io_channel_shutdown(channels[0], FALSE, NULL);
+		g_io_channel_shutdown(ctx->channels[0], FALSE, NULL);
 
 		/* Send last packet. */
 		packet.type = SR_DF_END;
-		sr_session_send(cb_data, &packet);
+		sr_session_send(ctx->session_dev_id, &packet);
 
 		return FALSE;
 	}
@@ -434,19 +442,21 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 		return SR_ERR;
 	}
 
-	channels[0] = g_io_channel_unix_new(ctx->pipe_fds[0]);
-	channels[1] = g_io_channel_unix_new(ctx->pipe_fds[1]);
+	ctx->channels[0] = g_io_channel_unix_new(ctx->pipe_fds[0]);
+	ctx->channels[1] = g_io_channel_unix_new(ctx->pipe_fds[1]);
+
+	g_io_channel_set_flags(ctx->channels[0], G_IO_FLAG_NONBLOCK, NULL);
 
 	/* Set channel encoding to binary (default is UTF-8). */
-	g_io_channel_set_encoding(channels[0], NULL, NULL);
-	g_io_channel_set_encoding(channels[1], NULL, NULL);
+	g_io_channel_set_encoding(ctx->channels[0], NULL, NULL);
+	g_io_channel_set_encoding(ctx->channels[1], NULL, NULL);
 
 	/* Make channels to unbuffered. */
-	g_io_channel_set_buffered(channels[0], FALSE);
-	g_io_channel_set_buffered(channels[1], FALSE);
+	g_io_channel_set_buffered(ctx->channels[0], FALSE);
+	g_io_channel_set_buffered(ctx->channels[1], FALSE);
 
-	sr_source_add(ctx->pipe_fds[0], G_IO_IN | G_IO_ERR, 40,
-		      receive_data, ctx->session_dev_id);
+	sr_session_source_add_channel(ctx->channels[0], G_IO_IN | G_IO_ERR,
+		    40, receive_data, ctx);
 
 	/* Run the demo thread. */
 	g_thread_init(NULL);
@@ -508,6 +518,7 @@ SR_PRIV struct sr_dev_driver demo_driver_info = {
 	.api_version = 1,
 	.init = hw_init,
 	.cleanup = hw_cleanup,
+	.scan = hw_scan,
 	.dev_open = hw_dev_open,
 	.dev_close = hw_dev_close,
 	.dev_info_get = hw_dev_info_get,