X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Fdemo%2Fdemo.c;h=850cf8a8ef533b53a686951d9fe09ef773b32c6f;hb=1953564a96798bc298d1c94eb90c129adbde1c9e;hp=9aa45f85401f14074e977f029f6b0ea257ff3560;hpb=49145a63c73e212e43f1ec901bfb4fe9f99e3caf;p=libsigrok.git diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c index 9aa45f85..850cf8a8 100644 --- a/hardware/demo/demo.c +++ b/hardware/demo/demo.c @@ -3,6 +3,7 @@ * * Copyright (C) 2010 Uwe Hermann * Copyright (C) 2011 Olivier Fauchon + * Copyright (C) 2012 Alexandru Gagniuc * * 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 @@ -77,20 +78,19 @@ 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; + 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 = { @@ -111,14 +111,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, }; @@ -138,17 +131,22 @@ 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) +{ + /* Nothing needed so far. */ + + return SR_OK; +} + +static int hw_init(struct sr_context *sr_ctx) { struct drv_context *drvc; @@ -156,7 +154,8 @@ static int hw_init(void) sr_err("Driver context malloc failed."); return SR_ERR_MALLOC; } - ddi->priv = drvc; + drvc->sr_ctx = sr_ctx; + di->priv = drvc; return SR_OK; } @@ -171,7 +170,7 @@ 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); @@ -179,7 +178,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, @@ -198,7 +197,7 @@ static GSList *hw_dev_list(void) { struct drv_context *drvc; - drvc = ddi->priv; + drvc = di->priv; return drvc->instances; } @@ -236,12 +235,6 @@ static int hw_info_get(int info_id, const void **data, 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; - break; case SR_DI_SAMPLERATES: *data = &samplerates; break; @@ -266,24 +259,24 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, (void)sdi; - if (hwcap == SR_HWCAP_SAMPLERATE) { + if (hwcap == 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 (hwcap == 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 (hwcap == 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 (hwcap == SR_CONF_PATTERN_MODE) { stropt = value; ret = SR_OK; if (!strcmp(stropt, "sigrok")) { @@ -307,10 +300,10 @@ 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 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? */ @@ -344,91 +337,49 @@ 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 (limit_samples) { + samples_to_send = MIN(samples_to_send, + limit_samples - devc->samples_counter); + } - if (!thread_running && z <= 0) { - /* Make sure we don't receive more packets. */ - g_io_channel_shutdown(devc->channels[0], FALSE, NULL); + while (samples_to_send > 0) { + sending_now = MIN(samples_to_send, sizeof(buf)); + samples_to_send -= sending_now; + samples_generator(buf, sending_now, devc); - /* Send last packet. */ - packet.type = SR_DF_END; + packet.type = SR_DF_LOGIC; + packet.payload = &logic; + logic.length = sending_now; + logic.unitsize = 1; + logic.data = buf; sr_session_send(devc->session_dev_id, &packet); + devc->samples_counter += sending_now; + } - return FALSE; + if (limit_samples && devc->samples_counter >= limit_samples) { + sr_info("Requested number of samples reached."); + hw_dev_acquisition_stop(NULL, cb_data); + return TRUE; } return TRUE; @@ -439,7 +390,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, { struct sr_datafeed_packet *packet; struct sr_datafeed_header *header; - struct sr_datafeed_meta_logic meta; struct dev_context *devc; (void)sdi; @@ -456,6 +406,13 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, devc->session_dev_id = 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__); @@ -478,16 +435,6 @@ 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; @@ -504,12 +451,8 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, 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); + /* We use this timestamp to decide how many more samples to send. */ + devc->starttime = g_get_monotonic_time(); g_free(header); g_free(packet); @@ -520,17 +463,20 @@ 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 = sdi->priv; + devc = 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); return SR_OK; } @@ -543,6 +489,7 @@ SR_PRIV struct sr_dev_driver demo_driver_info = { .cleanup = hw_cleanup, .scan = hw_scan, .dev_list = hw_dev_list, + .dev_clear = clear_instances, .dev_open = hw_dev_open, .dev_close = hw_dev_close, .info_get = hw_info_get,