X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=c1faaefb0e41c6efd8d4aa4cdc05338e417ade47;hb=3ebce226a2672ea4f0788f5f2a222586148aabc1;hp=cf8cef6ff9fdcb46e7fb76b6b6cd8395f5256301;hpb=c216d62307a000c75265594a34e8fefee7ba9efc;p=libsigrok.git

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index cf8cef6f..c1faaefb 100644
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -49,6 +49,12 @@
 /* TODO: Should be configurable. */
 #define BUFSIZE                4096
 
+#define STR_PATTERN_SIGROK   "sigrok"
+#define STR_PATTERN_RANDOM   "random"
+#define STR_PATTERN_INC      "incremental"
+#define STR_PATTERN_ALL_LOW  "all-low"
+#define STR_PATTERN_ALL_HIGH "all-high"
+
 /* Supported patterns which we can generate */
 enum {
 	/**
@@ -78,27 +84,26 @@ struct dev_context {
 	int pipe_fds[2];
 	GIOChannel *channels[2];
 	uint8_t sample_generator;
-	uint8_t thread_running;
 	uint64_t samples_counter;
-	void *session_dev_id;
-	GTimer *timer;
+	void *cb_data;
+	int64_t starttime;
 };
 
 static const int hwcaps[] = {
-	SR_HWCAP_LOGIC_ANALYZER,
-	SR_HWCAP_DEMO_DEV,
-	SR_HWCAP_SAMPLERATE,
-	SR_HWCAP_PATTERN_MODE,
-	SR_HWCAP_LIMIT_SAMPLES,
-	SR_HWCAP_LIMIT_MSEC,
-	SR_HWCAP_CONTINUOUS,
+	SR_CONF_LOGIC_ANALYZER,
+	SR_CONF_DEMO_DEV,
+	SR_CONF_SAMPLERATE,
+	SR_CONF_PATTERN_MODE,
+	SR_CONF_LIMIT_SAMPLES,
+	SR_CONF_LIMIT_MSEC,
+	SR_CONF_CONTINUOUS,
 };
 
 static const struct sr_samplerates samplerates = {
-	SR_HZ(1),
-	SR_GHZ(1),
-	SR_HZ(1),
-	NULL,
+	.low  = SR_HZ(1),
+	.high = SR_GHZ(1),
+	.step = SR_HZ(1),
+	.list = NULL,
 };
 
 static const char *pattern_strings[] = {
@@ -112,14 +117,7 @@ static const char *pattern_strings[] = {
 
 /* We name the probes 0-7 on our demo driver. */
 static const char *probe_names[NUM_PROBES + 1] = {
-	"0",
-	"1",
-	"2",
-	"3",
-	"4",
-	"5",
-	"6",
-	"7",
+	"0", "1", "2", "3", "4", "5", "6", "7",
 	NULL,
 };
 
@@ -139,29 +137,26 @@ static uint8_t pattern_sigrok[] = {
 
 /* List of struct sr_dev_inst, maintained by dev_open()/dev_close(). */
 SR_PRIV struct sr_dev_driver demo_driver_info;
-static struct sr_dev_driver *ddi = &demo_driver_info;
+static struct sr_dev_driver *di = &demo_driver_info;
 static uint64_t cur_samplerate = SR_KHZ(200);
 static uint64_t limit_samples = 0;
 static uint64_t limit_msec = 0;
 static int default_pattern = PATTERN_SIGROK;
-static GThread *my_thread;
-static int thread_running;
 
 static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
 
-static int hw_init(void)
+static int clear_instances(void)
 {
-	struct drv_context *drvc;
-
-	if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
-		sr_err("Driver context malloc failed.");
-		return SR_ERR_MALLOC;
-	}
-	ddi->priv = drvc;
+	/* Nothing needed so far. */
 
 	return SR_OK;
 }
 
+static int hw_init(struct sr_context *sr_ctx)
+{
+	return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN);
+}
+
 static GSList *hw_scan(GSList *options)
 {
 	struct sr_dev_inst *sdi;
@@ -172,7 +167,8 @@ static GSList *hw_scan(GSList *options)
 
 	(void)options;
 
-	drvc = ddi->priv;
+	drvc = di->priv;
+
 	devices = NULL;
 
 	sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, DEMONAME, NULL, NULL);
@@ -180,7 +176,7 @@ static GSList *hw_scan(GSList *options)
 		sr_err("%s: sr_dev_inst_new failed", __func__);
 		return 0;
 	}
-	sdi->driver = ddi;
+	sdi->driver = di;
 
 	for (i = 0; probe_names[i]; i++) {
 		if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE,
@@ -197,11 +193,7 @@ static GSList *hw_scan(GSList *options)
 
 static GSList *hw_dev_list(void)
 {
-	struct drv_context *drvc;
-
-	drvc = ddi->priv;
-
-	return drvc->instances;
+	return ((struct drv_context *)(di->priv))->instances;
 }
 
 static int hw_dev_open(struct sr_dev_inst *sdi)
@@ -228,29 +220,38 @@ static int hw_cleanup(void)
 	return SR_OK;
 }
 
-static int hw_info_get(int info_id, const void **data,
-       const struct sr_dev_inst *sdi)
+static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
 {
 	(void)sdi;
 
-	switch (info_id) {
-	case SR_DI_HWCAPS:
-		*data = hwcaps;
-		break;
-	case SR_DI_NUM_PROBES:
-		*data = GINT_TO_POINTER(NUM_PROBES);
-		break;
-	case SR_DI_PROBE_NAMES:
-		*data = probe_names;
+	switch (id) {
+	case SR_CONF_SAMPLERATE:
+		*data = &cur_samplerate;
 		break;
-	case SR_DI_SAMPLERATES:
-		*data = &samplerates;
+	case SR_CONF_LIMIT_SAMPLES:
+		*data = &limit_samples;
 		break;
-	case SR_DI_CUR_SAMPLERATE:
-		*data = &cur_samplerate;
+	case SR_CONF_LIMIT_MSEC:
+		*data = &limit_msec;
 		break;
-	case SR_DI_PATTERNS:
-		*data = &pattern_strings;
+	case SR_CONF_PATTERN_MODE:
+		switch (default_pattern) {
+		case PATTERN_SIGROK:
+			*data = STR_PATTERN_SIGROK;
+			break;
+		case PATTERN_RANDOM:
+			*data = STR_PATTERN_RANDOM;
+			break;
+		case PATTERN_INC:
+			*data = STR_PATTERN_INC;
+			break;
+		case PATTERN_ALL_LOW:
+			*data = STR_PATTERN_ALL_LOW;
+			break;
+		case PATTERN_ALL_HIGH:
+			*data = STR_PATTERN_ALL_HIGH;
+			break;
+		}
 		break;
 	default:
 		return SR_ERR_ARG;
@@ -259,43 +260,42 @@ static int hw_info_get(int info_id, const void **data,
 	return SR_OK;
 }
 
-static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
-		const void *value)
+static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
 	int ret;
 	const char *stropt;
 
 	(void)sdi;
 
-	if (hwcap == SR_HWCAP_SAMPLERATE) {
+	if (id == SR_CONF_SAMPLERATE) {
 		cur_samplerate = *(const uint64_t *)value;
 		sr_dbg("%s: setting samplerate to %" PRIu64, __func__,
 		       cur_samplerate);
 		ret = SR_OK;
-	} else if (hwcap == SR_HWCAP_LIMIT_SAMPLES) {
+	} else if (id == SR_CONF_LIMIT_SAMPLES) {
 		limit_msec = 0;
 		limit_samples = *(const uint64_t *)value;
 		sr_dbg("%s: setting limit_samples to %" PRIu64, __func__,
 		       limit_samples);
 		ret = SR_OK;
-	} else if (hwcap == SR_HWCAP_LIMIT_MSEC) {
+	} else if (id == SR_CONF_LIMIT_MSEC) {
 		limit_msec = *(const uint64_t *)value;
 		limit_samples = 0;
 		sr_dbg("%s: setting limit_msec to %" PRIu64, __func__,
 		       limit_msec);
 		ret = SR_OK;
-	} else if (hwcap == SR_HWCAP_PATTERN_MODE) {
+	} else if (id == SR_CONF_PATTERN_MODE) {
 		stropt = value;
 		ret = SR_OK;
-		if (!strcmp(stropt, "sigrok")) {
+		if (!strcmp(stropt, STR_PATTERN_SIGROK)) {
 			default_pattern = PATTERN_SIGROK;
-		} else if (!strcmp(stropt, "random")) {
+		} else if (!strcmp(stropt, STR_PATTERN_RANDOM)) {
 			default_pattern = PATTERN_RANDOM;
-		} else if (!strcmp(stropt, "incremental")) {
+		} else if (!strcmp(stropt, STR_PATTERN_INC)) {
 			default_pattern = PATTERN_INC;
-		} else if (!strcmp(stropt, "all-low")) {
+		} else if (!strcmp(stropt, STR_PATTERN_ALL_LOW)) {
 			default_pattern = PATTERN_ALL_LOW;
-		} else if (!strcmp(stropt, "all-high")) {
+		} else if (!strcmp(stropt, STR_PATTERN_ALL_HIGH)) {
 			default_pattern = PATTERN_ALL_HIGH;
 		} else {
 			ret = SR_ERR;
@@ -308,10 +308,32 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 	return ret;
 }
 
-static void samples_generator(uint8_t *buf, uint64_t size, void *data)
+static int config_list(int key, const void **data, const struct sr_dev_inst *sdi)
+{
+
+	(void)sdi;
+
+	switch (key) {
+	case SR_CONF_DEVICE_OPTIONS:
+		*data = hwcaps;
+		break;
+	case SR_CONF_SAMPLERATE:
+		*data = &samplerates;
+		break;
+	case SR_CONF_PATTERN_MODE:
+		*data = &pattern_strings;
+		break;
+	default:
+		return SR_ERR_ARG;
+	}
+
+	return SR_OK;
+}
+
+static void samples_generator(uint8_t *buf, uint64_t size,
+			      struct dev_context *devc)
 {
 	static uint64_t p = 0;
-	struct dev_context *devc = data;
 	uint64_t i;
 
 	/* TODO: Needed? */
@@ -345,84 +367,47 @@ static void samples_generator(uint8_t *buf, uint64_t size, void *data)
 	}
 }
 
-/* Thread function */
-static void thread_func(void *data)
-{
-	struct dev_context *devc = data;
-	uint8_t buf[BUFSIZE];
-	uint64_t nb_to_send = 0;
-	int bytes_written;
-	double time_cur, time_last, time_diff;
-
-	time_last = g_timer_elapsed(devc->timer, NULL);
-
-	while (thread_running) {
-		/* Rate control */
-		time_cur = g_timer_elapsed(devc->timer, NULL);
-
-		time_diff = time_cur - time_last;
-		time_last = time_cur;
-
-		nb_to_send = cur_samplerate * time_diff;
-
-		if (limit_samples) {
-			nb_to_send = MIN(nb_to_send,
-				      limit_samples - devc->samples_counter);
-		}
-
-		/* Make sure we don't overflow. */
-		nb_to_send = MIN(nb_to_send, BUFSIZE);
-
-		if (nb_to_send) {
-			samples_generator(buf, nb_to_send, data);
-			devc->samples_counter += nb_to_send;
-
-			g_io_channel_write_chars(devc->channels[1], (gchar *)&buf,
-				nb_to_send, (gsize *)&bytes_written, NULL);
-		}
-
-		/* Check if we're done. */
-		if ((limit_msec && time_cur * 1000 > limit_msec) ||
-		    (limit_samples && devc->samples_counter >= limit_samples))
-		{
-			close(devc->pipe_fds[1]);
-			thread_running = 0;
-		}
-
-		g_usleep(10);
-	}
-}
-
 /* Callback handling data */
 static int receive_data(int fd, int revents, void *cb_data)
 {
 	struct dev_context *devc = cb_data;
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_logic logic;
-	static uint64_t samples_received = 0;
-	unsigned char c[BUFSIZE];
-	gsize z;
+	uint8_t buf[BUFSIZE];
+	static uint64_t samples_to_send, expected_samplenum, sending_now;
+	int64_t time, elapsed;
 
 	(void)fd;
 	(void)revents;
 
-	do {
-		g_io_channel_read_chars(devc->channels[0],
-				        (gchar *)&c, BUFSIZE, &z, NULL);
-
-		if (z > 0) {
-			packet.type = SR_DF_LOGIC;
-			packet.payload = &logic;
-			logic.length = z;
-			logic.unitsize = 1;
-			logic.data = c;
-			sr_session_send(devc->session_dev_id, &packet);
-			samples_received += z;
-		}
-	} while (z > 0);
+	/* How many "virtual" samples should we have collected by now? */
+	time = g_get_monotonic_time();
+	elapsed = time - devc->starttime;
+	expected_samplenum = elapsed * cur_samplerate / 1000000;
+	/* Of those, how many do we still have to send? */
+	samples_to_send = expected_samplenum - devc->samples_counter;
 
-	if (!thread_running && z <= 0) {
-		/* Make sure we don't receive more packets. */
+	if (limit_samples) {
+		samples_to_send = MIN(samples_to_send,
+				 limit_samples - devc->samples_counter);
+	}
+
+	while (samples_to_send > 0) {
+		sending_now = MIN(samples_to_send, sizeof(buf));
+		samples_to_send -= sending_now;
+		samples_generator(buf, sending_now, devc);
+
+		packet.type = SR_DF_LOGIC;
+		packet.payload = &logic;
+		logic.length = sending_now;
+		logic.unitsize = 1;
+		logic.data = buf;
+		sr_session_send(devc->cb_data, &packet);
+		devc->samples_counter += sending_now;
+	}
+
+	if (limit_samples && devc->samples_counter >= limit_samples) {
+		sr_info("Requested number of samples reached.");
 		hw_dev_acquisition_stop(NULL, cb_data);
 		return TRUE;
 	}
@@ -433,15 +418,10 @@ static int receive_data(int fd, int revents, void *cb_data)
 static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 		void *cb_data)
 {
-	struct sr_datafeed_packet *packet;
-	struct sr_datafeed_header *header;
-	struct sr_datafeed_meta_logic meta;
 	struct dev_context *devc;
 
 	(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__);
@@ -449,9 +429,16 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	}
 
 	devc->sample_generator = default_pattern;
-	devc->session_dev_id = cb_data;
+	devc->cb_data = cb_data;
 	devc->samples_counter = 0;
 
+	/*
+	 * Setting two channels connected by a pipe is a remnant from when the
+	 * demo driver generated data in a thread, and collected and sent the
+	 * data in the main program loop.
+	 * They are kept here because it provides a convenient way of setting
+	 * up a timeout-based polling mechanism.
+	 */
 	if (pipe(devc->pipe_fds)) {
 		/* TODO: Better error message. */
 		sr_err("%s: pipe() failed", __func__);
@@ -474,41 +461,11 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	sr_session_source_add_channel(devc->channels[0], G_IO_IN | G_IO_ERR,
 		    40, receive_data, devc);
 
-	/* Run the demo thread. */
-	devc->timer = g_timer_new();
-	thread_running = 1;
-	my_thread = g_thread_try_new("sigrok demo generator",
-			(GThreadFunc)thread_func, devc, NULL);
-	if (!my_thread) {
-		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("%s: packet malloc failed", __func__);
-		return SR_ERR_MALLOC;
-	}
+	/* Send header packet to the session bus. */
+	std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
 
-	if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) {
-		sr_err("%s: header malloc failed", __func__);
-		return SR_ERR_MALLOC;
-	}
-
-	packet->type = SR_DF_HEADER;
-	packet->payload = header;
-	header->feed_version = 1;
-	gettimeofday(&header->starttime, NULL);
-	sr_session_send(devc->session_dev_id, packet);
-
-	/* Send metadata about the SR_DF_LOGIC packets to come. */
-	packet->type = SR_DF_META_LOGIC;
-	packet->payload = &meta;
-	meta.samplerate = cur_samplerate;
-	meta.num_probes = NUM_PROBES;
-	sr_session_send(devc->session_dev_id, packet);
-
-	g_free(header);
-	g_free(packet);
+	/* We use this timestamp to decide how many more samples to send. */
+	devc->starttime = g_get_monotonic_time();
 
 	return SR_OK;
 }
@@ -524,15 +481,12 @@ static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 
 	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);
+	sr_session_send(devc->cb_data, &packet);
 
 	return SR_OK;
 }
@@ -545,10 +499,12 @@ SR_PRIV struct sr_dev_driver demo_driver_info = {
 	.cleanup = hw_cleanup,
 	.scan = hw_scan,
 	.dev_list = hw_dev_list,
+	.dev_clear = clear_instances,
+	.config_get = config_get,
+	.config_set = config_set,
+	.config_list = config_list,
 	.dev_open = hw_dev_open,
 	.dev_close = hw_dev_close,
-	.info_get = hw_info_get,
-	.dev_config_set = hw_dev_config_set,
 	.dev_acquisition_start = hw_dev_acquisition_start,
 	.dev_acquisition_stop = hw_dev_acquisition_stop,
 	.priv = NULL,