X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=8a8b2cf40b5044de93b6197676b605245c88223d;hb=472bbb464bf9522ed757826ec590aaf8bab087b5;hp=dfc944131bbbbae87005f7ca88946e91395a09bc;hpb=b4750a3a938ff5be295095b05e27c0f7a7cd2bbe;p=libsigrok.git

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index dfc94413..8a8b2cf4 100644
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -30,6 +30,15 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
+/* Message logging helpers with driver-specific prefix string. */
+#define DRIVER_LOG_DOMAIN "demo: "
+#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
+#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+
 /* TODO: Number of probes should be configurable. */
 #define NUM_PROBES             8
 
@@ -63,13 +72,6 @@ enum {
 	PATTERN_ALL_HIGH,
 };
 
-/* FIXME: Should not be global. */
-
-/* Private driver context. */
-struct drv_context {
-	GSList *instances;
-};
-
 /* Private, per-device-instance driver context. */
 struct dev_context {
 	int pipe_fds[2];
@@ -144,16 +146,15 @@ static int default_pattern = PATTERN_SIGROK;
 static GThread *my_thread;
 static int thread_running;
 
-static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
-		void *cb_data);
+static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
 
 static int hw_init(void)
 {
 	struct drv_context *drvc;
 
 	if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
-		sr_err("fx2lafw: driver context malloc failed.");
-		return SR_ERR;
+		sr_err("Driver context malloc failed.");
+		return SR_ERR_MALLOC;
 	}
 	ddi->priv = drvc;
 
@@ -169,12 +170,13 @@ static GSList *hw_scan(GSList *options)
 	int i;
 
 	(void)options;
+
 	drvc = ddi->priv;
 	devices = NULL;
 
 	sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, DEMONAME, NULL, NULL);
 	if (!sdi) {
-		sr_err("demo: %s: sr_dev_inst_new failed", __func__);
+		sr_err("%s: sr_dev_inst_new failed", __func__);
 		return 0;
 	}
 	sdi->driver = ddi;
@@ -192,9 +194,17 @@ static GSList *hw_scan(GSList *options)
 	return devices;
 }
 
+static GSList *hw_dev_list(void)
+{
+	struct drv_context *drvc;
+
+	drvc = ddi->priv;
+
+	return drvc->instances;
+}
+
 static int hw_dev_open(struct sr_dev_inst *sdi)
 {
-	/* Avoid compiler warnings. */
 	(void)sdi;
 
 	/* Nothing needed so far. */
@@ -204,7 +214,6 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
 
 static int hw_dev_close(struct sr_dev_inst *sdi)
 {
-	/* Avoid compiler warnings. */
 	(void)sdi;
 
 	/* Nothing needed so far. */
@@ -221,7 +230,6 @@ static int hw_cleanup(void)
 static int hw_info_get(int info_id, const void **data,
        const struct sr_dev_inst *sdi)
 {
-
 	(void)sdi;
 
 	switch (info_id) {
@@ -258,24 +266,21 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 
 	(void)sdi;
 
-	if (hwcap == SR_HWCAP_PROBECONFIG) {
-		/* Nothing to do, but must be supported */
-		ret = SR_OK;
-	} else if (hwcap == SR_HWCAP_SAMPLERATE) {
+	if (hwcap == SR_HWCAP_SAMPLERATE) {
 		cur_samplerate = *(const uint64_t *)value;
-		sr_dbg("demo: %s: setting samplerate to %" PRIu64, __func__,
+		sr_dbg("%s: setting samplerate to %" PRIu64, __func__,
 		       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__,
+		sr_dbg("%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__,
+		sr_dbg("%s: setting limit_msec to %" PRIu64, __func__,
 		       limit_msec);
 		ret = SR_OK;
 	} else if (hwcap == SR_HWCAP_PATTERN_MODE) {
@@ -294,8 +299,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		} else {
 			ret = SR_ERR;
 		}
-		sr_dbg("demo: %s: setting pattern to %d", __func__,
-		       default_pattern);
+		sr_dbg("%s: setting pattern to %d", __func__, default_pattern);
 	} else {
 		ret = SR_ERR;
 	}
@@ -335,8 +339,7 @@ static void samples_generator(uint8_t *buf, uint64_t size, void *data)
 		memset(buf, 0xff, size);
 		break;
 	default:
-		sr_err("demo: %s: unknown pattern %d", __func__,
-		       devc->sample_generator);
+		sr_err("Unknown pattern: %d.", devc->sample_generator);
 		break;
 	}
 }
@@ -399,7 +402,6 @@ static int receive_data(int fd, int revents, void *cb_data)
 	unsigned char c[BUFSIZE];
 	gsize z;
 
-	/* Avoid compiler warnings. */
 	(void)fd;
 	(void)revents;
 
@@ -444,7 +446,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 
 	/* TODO: 'devc' is never g_free()'d? */
 	if (!(devc = g_try_malloc(sizeof(struct dev_context)))) {
-		sr_err("demo: %s: devc malloc failed", __func__);
+		sr_err("%s: devc malloc failed", __func__);
 		return SR_ERR_MALLOC;
 	}
 
@@ -454,7 +456,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 
 	if (pipe(devc->pipe_fds)) {
 		/* TODO: Better error message. */
-		sr_err("demo: %s: pipe() failed", __func__);
+		sr_err("%s: pipe() failed", __func__);
 		return SR_ERR;
 	}
 
@@ -475,24 +477,22 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 		    40, receive_data, devc);
 
 	/* Run the demo thread. */
-	g_thread_init(NULL);
-	/* This must to be done between g_thread_init() & g_thread_create(). */
 	devc->timer = g_timer_new();
 	thread_running = 1;
-	my_thread =
-	    g_thread_create((GThreadFunc)thread_func, devc, TRUE, NULL);
+	my_thread = g_thread_try_new("sigrok demo generator",
+			(GThreadFunc)thread_func, devc, NULL);
 	if (!my_thread) {
-		sr_err("demo: %s: g_thread_create failed", __func__);
+		sr_err("%s: g_thread_try_new failed", __func__);
 		return SR_ERR; /* TODO */
 	}
 
 	if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) {
-		sr_err("demo: %s: packet malloc failed", __func__);
+		sr_err("%s: packet malloc failed", __func__);
 		return SR_ERR_MALLOC;
 	}
 
 	if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) {
-		sr_err("demo: %s: header malloc failed", __func__);
+		sr_err("%s: header malloc failed", __func__);
 		return SR_ERR_MALLOC;
 	}
 
@@ -515,16 +515,19 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	return SR_OK;
 }
 
-static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
-		void *cb_data)
+static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
-	/* Avoid compiler warnings. */
-	(void)sdi;
+	struct dev_context *devc;
+
 	(void)cb_data;
 
+	devc = sdi->priv;
+
 	/* Stop generate thread. */
 	thread_running = 0;
 
+	sr_session_source_remove_channel(devc->channels[0]);
+
 	return SR_OK;
 }
 
@@ -535,6 +538,7 @@ SR_PRIV struct sr_dev_driver demo_driver_info = {
 	.init = hw_init,
 	.cleanup = hw_cleanup,
 	.scan = hw_scan,
+	.dev_list = hw_dev_list,
 	.dev_open = hw_dev_open,
 	.dev_close = hw_dev_close,
 	.info_get = hw_info_get,