X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=67df85e4acd8a4e103efe0e47f208ddfbae1c4ab;hb=f1b296fcd290a53c269f5fb0d9e1a3480c1346b6;hp=d6e149de7fb86254f1c33c1c2c8d0ceb0f7c634c;hpb=d68e2d1a21ac5c3f24d88b7689f98764e4d57c30;p=libsigrok.git diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c index d6e149de..67df85e4 100644 --- a/hardware/demo/demo.c +++ b/hardware/demo/demo.c @@ -1,8 +1,9 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrok project. * * 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 @@ -22,485 +23,683 @@ #include #include #include +#include #ifdef _WIN32 #include #include #define pipe(fds) _pipe(fds, 4096, _O_BINARY) #endif -#include "sigrok.h" -#include "sigrok-internal.h" +#include "libsigrok.h" +#include "libsigrok-internal.h" + +/* Message logging helpers with subsystem-specific prefix string. */ +#define LOG_PREFIX "demo: " +#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args) +#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args) +#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args) +#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args) +#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args) +#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args) /* TODO: Number of probes should be configurable. */ -#define NUM_PROBES 8 +#define NUM_PROBES 16 #define DEMONAME "Demo device" /* The size of chunks to send through the session bus. */ /* TODO: Should be configurable. */ -#define BUFSIZE 4096 +#define BUFSIZE 1024*1024 -/* Supported patterns which we can generate */ -enum { - /** - * Pattern which spells "sigrok" using '0's (with '1's as "background") - * when displayed using the 'bits' output format. - */ - PATTERN_SIGROK, +#define PERIOD 4000 - /** Pattern which consists of (pseudo-)random values on all probes. */ - PATTERN_RANDOM, +#define PI 3.14159265 - /** - * Pattern which consists of incrementing numbers. - * TODO: Better description. - */ - PATTERN_INC, +#define CONST_LEN 50 - /** Pattern where all probes have a low logic state. */ - PATTERN_ALL_LOW, - - /** Pattern where all probes have a high logic state. */ - PATTERN_ALL_HIGH, +/* Supported patterns which we can generate */ +enum { + PATTERN_SINE = 0, + PATTERN_SQUARE = 1, + PATTERN_TRIANGLE = 2, + PATTERN_SAWTOOTH = 3, + PATTERN_RANDOM = 4, +}; +static const char *pattern_strings[] = { + "Sine", + "Square", + "Triangle", + "Sawtooth", + "Random", }; -/* FIXME: Should not be global. */ -SR_PRIV GIOChannel *channels[2]; - -struct databag { +/* Private, per-device-instance driver context. */ +struct dev_context { + struct sr_dev_inst *sdi; int pipe_fds[2]; + GIOChannel *channel; + uint64_t cur_samplerate; + uint64_t limit_samples; + uint64_t limit_msec; uint8_t sample_generator; - uint8_t thread_running; uint64_t samples_counter; - int device_index; - gpointer session_data; - GTimer *timer; + void *cb_data; + int64_t starttime; + int stop; + + int trigger_stage; + uint16_t trigger_mask; + uint16_t trigger_value; + uint16_t trigger_edge; }; -static int capabilities[] = { - SR_HWCAP_LOGIC_ANALYZER, - SR_HWCAP_DEMO_DEVICE, - SR_HWCAP_SAMPLERATE, - SR_HWCAP_PATTERN_MODE, - SR_HWCAP_LIMIT_SAMPLES, - SR_HWCAP_LIMIT_MSEC, - SR_HWCAP_CONTINUOUS, +static const int hwcaps[] = { + 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 struct sr_samplerates samplerates = { - SR_HZ(1), - SR_GHZ(1), - SR_HZ(1), - NULL, +static const int hwoptions[] = { + SR_CONF_PATTERN_MODE, }; -static const char *pattern_strings[] = { - "sigrok", - "random", - "incremental", - "all-low", - "all-high", - NULL, +static const uint64_t samplerates[] = { + SR_KHZ(10), + SR_KHZ(20), + SR_KHZ(50), + SR_KHZ(100), + SR_KHZ(200), + SR_KHZ(500), + SR_MHZ(1), + SR_MHZ(2), + SR_MHZ(5), + SR_MHZ(10), + SR_MHZ(20), + SR_MHZ(50), + SR_MHZ(100), + SR_MHZ(200), }; + + +/* 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", + "Channel 0", "Channel 1", "Channel 2", "Channel 3", + "Channel 4", "Channel 5", "Channel 6", "Channel 7", + "Channel 8", "Channel 9", "Channel 10", "Channel 11", + "Channel 12", "Channel 13", "Channel 14", "Channel 15", NULL, }; -static uint8_t pattern_sigrok[] = { - 0x4c, 0x92, 0x92, 0x92, 0x64, 0x00, 0x00, 0x00, - 0x82, 0xfe, 0xfe, 0x82, 0x00, 0x00, 0x00, 0x00, - 0x7c, 0x82, 0x82, 0x92, 0x74, 0x00, 0x00, 0x00, - 0xfe, 0x12, 0x12, 0x32, 0xcc, 0x00, 0x00, 0x00, - 0x7c, 0x82, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00, - 0xfe, 0x10, 0x28, 0x44, 0x82, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xbe, 0xbe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +/* Private, per-device-instance driver context. */ +/* TODO: struct context as with the other drivers. */ + +/* 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 *di = &demo_driver_info; -/* List of struct sr_dev_inst, maintained by opendev()/closedev(). */ -static GSList *dev_insts = NULL; -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; +extern struct ds_trigger *trigger; -static int hw_stop_acquisition(int device_index, gpointer session_data); +static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data); + +static int clear_instances(void) +{ + /* Nothing needed so far. */ + + return SR_OK; +} + +static int hw_init(struct sr_context *sr_ctx) +{ + return std_hw_init(sr_ctx, di, LOG_PREFIX); +} -static int hw_init(const char *deviceinfo) +static GSList *hw_scan(GSList *options) { struct sr_dev_inst *sdi; + struct sr_probe *probe; + struct drv_context *drvc; + struct dev_context *devc; + GSList *devices; + int i; - /* Avoid compiler warnings. */ - (void)deviceinfo; + (void)options; - sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, DEMONAME, NULL, NULL); + drvc = di->priv; + + devices = NULL; + + sdi = sr_dev_inst_new(LOGIC, 0, SR_ST_ACTIVE, DEMONAME, NULL, NULL); if (!sdi) { - sr_err("demo: %s: sr_dev_inst_new failed", __func__); - return 0; + sr_err("Device instance creation failed."); + return NULL; + } + sdi->driver = di; + + devices = g_slist_append(devices, sdi); + drvc->instances = g_slist_append(drvc->instances, sdi); + + if (!(devc = g_try_malloc(sizeof(struct dev_context)))) { + sr_err("Device context malloc failed."); + return NULL; } - dev_insts = g_slist_append(dev_insts, sdi); + devc->sdi = sdi; + devc->cur_samplerate = SR_MHZ(200); + devc->limit_samples = 0; + devc->limit_msec = 0; + devc->sample_generator = PATTERN_SINE; + + sdi->priv = devc; + + if (sdi->mode == LOGIC) { + for (i = 0; probe_names[i]; i++) { + if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, + probe_names[i]))) + return NULL; + sdi->probes = g_slist_append(sdi->probes, probe); + } + } else if (sdi->mode == ANALOG) { + for (i = 0; i < DS_MAX_ANALOG_PROBES_NUM; i++) { + if (!(probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE, + probe_names[i]))) + return NULL; + sdi->probes = g_slist_append(sdi->probes, probe); + } + } + + return devices; +} - return 1; +static GSList *hw_dev_list(void) +{ + return ((struct drv_context *)(di->priv))->instances; } -static int hw_opendev(int device_index) +static int hw_dev_open(struct sr_dev_inst *sdi) { - /* Avoid compiler warnings. */ - (void)device_index; + (void)sdi; - /* Nothing needed so far. */ + sdi->status = SR_ST_ACTIVE; return SR_OK; } -static int hw_closedev(int device_index) +static int hw_dev_close(struct sr_dev_inst *sdi) { - /* Avoid compiler warnings. */ - (void)device_index; + (void)sdi; - /* Nothing needed so far. */ + sdi->status = SR_ST_INACTIVE; return SR_OK; } static int hw_cleanup(void) { - /* Nothing needed so far. */ - return SR_OK; + GSList *l; + struct sr_dev_inst *sdi; + struct drv_context *drvc; + int ret = SR_OK; + + if (!(drvc = di->priv)) + return SR_OK; + + /* Properly close and free all devices. */ + for (l = drvc->instances; l; l = l->next) { + if (!(sdi = l->data)) { + /* Log error, but continue cleaning up the rest. */ + sr_err("%s: sdi was NULL, continuing", __func__); + ret = SR_ERR_BUG; + continue; + } + sr_dev_inst_free(sdi); + } + g_slist_free(drvc->instances); + drvc->instances = NULL; + + return ret; } -static void *hw_get_device_info(int device_index, int device_info_id) +static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi) { - struct sr_dev_inst *sdi; - void *info = NULL; + struct dev_context *const devc = sdi->priv; - if (!(sdi = sr_dev_inst_get(dev_insts, device_index))) { - sr_err("demo: %s: sdi was NULL", __func__); - return NULL; - } - - switch (device_info_id) { - case SR_DI_INSTANCE: - info = sdi; - break; - case SR_DI_NUM_PROBES: - info = GINT_TO_POINTER(NUM_PROBES); - break; - case SR_DI_PROBE_NAMES: - info = probe_names; + switch (id) { + case SR_CONF_SAMPLERATE: + *data = g_variant_new_uint64(devc->cur_samplerate); break; - case SR_DI_SAMPLERATES: - info = &samplerates; + case SR_CONF_LIMIT_SAMPLES: + *data = g_variant_new_uint64(devc->limit_samples); break; - case SR_DI_CUR_SAMPLERATE: - info = &cur_samplerate; + case SR_CONF_LIMIT_MSEC: + *data = g_variant_new_uint64(devc->limit_msec); break; - case SR_DI_PATTERNMODES: - info = &pattern_strings; + case SR_CONF_DEVICE_MODE: + *data = g_variant_new_string(mode_strings[sdi->mode]); + break; + case SR_CONF_PATTERN_MODE: + *data = g_variant_new_string(pattern_strings[devc->sample_generator]); break; + default: + return SR_ERR_NA; } - return info; -} - -static int hw_get_status(int device_index) -{ - /* Avoid compiler warnings. */ - (void)device_index; - - return SR_ST_ACTIVE; + return SR_OK; } -static int *hw_get_capabilities(void) +static int config_set(int id, GVariant *data, struct sr_dev_inst *sdi) { - return capabilities; -} + int i, ret; + const char *stropt; + struct sr_probe *probe; -static int hw_set_configuration(int device_index, int capability, void *value) -{ - int ret; - char *stropt; + struct dev_context *const devc = sdi->priv; - /* Avoid compiler warnings. */ - (void)device_index; + if (sdi->status != SR_ST_ACTIVE) + return SR_ERR_DEV_CLOSED; - if (capability == SR_HWCAP_PROBECONFIG) { - /* Nothing to do, but must be supported */ - ret = SR_OK; - } else if (capability == SR_HWCAP_SAMPLERATE) { - cur_samplerate = *(uint64_t *)value; - sr_dbg("demo: %s: setting samplerate to %" PRIu64, __func__, - cur_samplerate); - ret = SR_OK; - } else if (capability == SR_HWCAP_LIMIT_SAMPLES) { - limit_samples = *(uint64_t *)value; - sr_dbg("demo: %s: setting limit_samples to %" PRIu64, __func__, - limit_samples); + if (id == SR_CONF_SAMPLERATE) { + devc->cur_samplerate = g_variant_get_uint64(data); + sr_dbg("%s: setting samplerate to %" PRIu64, __func__, + devc->cur_samplerate); ret = SR_OK; - } else if (capability == SR_HWCAP_LIMIT_MSEC) { - limit_msec = *(uint64_t *)value; - sr_dbg("demo: %s: setting limit_msec to %" PRIu64, __func__, - limit_msec); + } else if (id == SR_CONF_LIMIT_SAMPLES) { + devc->limit_msec = 0; + devc->limit_samples = g_variant_get_uint64(data); + sr_dbg("%s: setting limit_samples to %" PRIu64, __func__, + devc->limit_samples); ret = SR_OK; - } else if (capability == SR_HWCAP_PATTERN_MODE) { - stropt = value; - ret = SR_OK; - if (!strcmp(stropt, "sigrok")) { - default_pattern = PATTERN_SIGROK; - } else if (!strcmp(stropt, "random")) { - default_pattern = PATTERN_RANDOM; - } else if (!strcmp(stropt, "incremental")) { - default_pattern = PATTERN_INC; - } else if (!strcmp(stropt, "all-low")) { - default_pattern = PATTERN_ALL_LOW; - } else if (!strcmp(stropt, "all-high")) { - default_pattern = PATTERN_ALL_HIGH; + } else if (id == SR_CONF_LIMIT_MSEC) { + devc->limit_msec = g_variant_get_uint64(data); + devc->limit_samples = 0; + sr_dbg("%s: setting limit_msec to %" PRIu64, __func__, + devc->limit_msec); + ret = SR_OK; + } else if (id == SR_CONF_DEVICE_MODE) { + stropt = g_variant_get_string(data, NULL); + ret = SR_OK; + if (!strcmp(stropt, mode_strings[LOGIC])) { + sdi->mode = LOGIC; + sr_dev_probes_free(sdi); + for (i = 0; probe_names[i]; i++) { + if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, + probe_names[i]))) + ret = SR_ERR; + else + sdi->probes = g_slist_append(sdi->probes, probe); + } + } else if (!strcmp(stropt, mode_strings[ANALOG])) { + sdi->mode = ANALOG; + sr_dev_probes_free(sdi); + for (i = 0; i < DS_MAX_ANALOG_PROBES_NUM; i++) { + if (!(probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE, + probe_names[i]))) + ret = SR_ERR; + else + sdi->probes = g_slist_append(sdi->probes, probe); + } + } else { + ret = SR_ERR; + } + sr_dbg("%s: setting mode to %d", __func__, sdi->mode); + }else if (id == SR_CONF_PATTERN_MODE) { + stropt = g_variant_get_string(data, NULL); + ret = SR_OK; + if (!strcmp(stropt, pattern_strings[PATTERN_SINE])) { + devc->sample_generator = PATTERN_SINE; + } else if (!strcmp(stropt, pattern_strings[PATTERN_SQUARE])) { + devc->sample_generator = PATTERN_SQUARE; + } else if (!strcmp(stropt, pattern_strings[PATTERN_TRIANGLE])) { + devc->sample_generator = PATTERN_TRIANGLE; + } else if (!strcmp(stropt, pattern_strings[PATTERN_SAWTOOTH])) { + devc->sample_generator = PATTERN_SAWTOOTH; + } else if (!strcmp(stropt, pattern_strings[PATTERN_RANDOM])) { + devc->sample_generator = PATTERN_RANDOM; } else { - ret = SR_ERR; + ret = SR_ERR; } - sr_dbg("demo: %s: setting pattern to %d", __func__, - default_pattern); + sr_dbg("%s: setting pattern to %d", + __func__, devc->sample_generator); } else { - ret = SR_ERR; + ret = SR_ERR_NA; } return ret; } -static void samples_generator(uint8_t *buf, uint64_t size, void *data) +static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi) { - static uint64_t p = 0; - struct databag *mydata = data; - uint64_t i; + GVariant *gvar; + GVariantBuilder gvb; - /* TODO: Needed? */ - memset(buf, 0, size); + (void)sdi; - switch (mydata->sample_generator) { - case PATTERN_SIGROK: /* sigrok pattern */ - for (i = 0; i < size; i++) { - *(buf + i) = ~(pattern_sigrok[p] >> 1); - if (++p == 64) - p = 0; - } + switch (key) { + case SR_CONF_DEVICE_OPTIONS: +// *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, +// hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t)); + *data = g_variant_new_from_data(G_VARIANT_TYPE("ai"), + hwcaps, ARRAY_SIZE(hwcaps)*sizeof(int32_t), TRUE, NULL, NULL); break; - case PATTERN_RANDOM: /* Random */ - for (i = 0; i < size; i++) - *(buf + i) = (uint8_t)(rand() & 0xff); + case SR_CONF_DEVICE_CONFIGS: +// *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, +// hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t)); + *data = g_variant_new_from_data(G_VARIANT_TYPE("ai"), + hwoptions, ARRAY_SIZE(hwoptions)*sizeof(int32_t), TRUE, NULL, NULL); + break; + case SR_CONF_SAMPLERATE: + g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}")); +// gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), samplerates, +// ARRAY_SIZE(samplerates), sizeof(uint64_t)); + gvar = g_variant_new_from_data(G_VARIANT_TYPE("at"), + samplerates, ARRAY_SIZE(samplerates)*sizeof(uint64_t), TRUE, NULL, NULL); + g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar); + *data = g_variant_builder_end(&gvb); break; - case PATTERN_INC: /* Simple increment */ - for (i = 0; i < size; i++) - *(buf + i) = i; - break; - case PATTERN_ALL_LOW: /* All probes are low */ - memset(buf, 0x00, size); - break; - case PATTERN_ALL_HIGH: /* All probes are high */ - memset(buf, 0xff, size); + case SR_CONF_DEVICE_MODE: + *data = g_variant_new_strv(mode_strings, ARRAY_SIZE(mode_strings)); + break; + case SR_CONF_PATTERN_MODE: + *data = g_variant_new_strv(pattern_strings, ARRAY_SIZE(pattern_strings)); break; default: - /* TODO: Error handling. */ - break; + return SR_ERR_NA; } + + return SR_OK; } -/* Thread function */ -static void thread_func(void *data) +static void samples_generator(uint16_t *buf, uint64_t size, + struct dev_context *devc) { - struct databag *mydata = 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(mydata->timer, NULL); - - while (thread_running) { - /* Rate control */ - time_cur = g_timer_elapsed(mydata->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 - mydata->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); - mydata->samples_counter += nb_to_send; - - g_io_channel_write_chars(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 && mydata->samples_counter >= limit_samples)) - { - close(mydata->pipe_fds[1]); - thread_running = 0; - } - - g_usleep(10); + static uint16_t p = 0; + uint64_t i; + uint16_t demo_data; + + switch (devc->sample_generator) { + case PATTERN_SINE: /* Sine */ + for (i = 0; i < size; i++) { + if (i%CONST_LEN == 0) { + demo_data = 0x8000 * sin(2 * PI * p / 0xffff) + 0x8000; + p += CONST_LEN; + } + *(buf + i) = demo_data; + } + break; + case PATTERN_SQUARE: + for (i = 0; i < size; i++) { + if (i%CONST_LEN == 0) { + demo_data = p > 0x7fff ? 0xf000 : 0x1000; + p += CONST_LEN; + } + *(buf + i) = demo_data; + } + break; + case PATTERN_TRIANGLE: + for (i = 0; i < size; i++) { + if (i%CONST_LEN == 0) { + demo_data = p > 0x7fff ? 0xffff * (2.0f * (0x10000 - p) / 0x10000) : + 0xffff * (2.0f * p / 0x10000); + p += CONST_LEN; + } + *(buf + i) = demo_data; + } + break; + case PATTERN_SAWTOOTH: + for (i = 0; i < size; i++) { + if (i%CONST_LEN == 0) { + demo_data = p; + p += CONST_LEN; + } + *(buf + i) = demo_data; + } + break; + case PATTERN_RANDOM: /* Random */ + for (i = 0; i < size; i++) { + if (i%CONST_LEN == 0) + demo_data = (uint16_t)(rand() * (0x10000 * 1.0f / RAND_MAX)); + *(buf + i) = demo_data; + } + break; + default: + sr_err("Unknown pattern: %d.", devc->sample_generator); + break; } } /* Callback handling data */ -static int receive_data(int fd, int revents, void *session_data) +static int receive_data(int fd, int revents, const struct sr_dev_inst *sdi) { - struct sr_datafeed_packet packet; - struct sr_datafeed_logic logic; - static uint64_t samples_received = 0; - unsigned char c[BUFSIZE]; - gsize z; + struct dev_context *devc = sdi->priv; + struct sr_datafeed_packet packet; + struct sr_datafeed_logic logic; + struct sr_datafeed_analog analog; + //uint16_t buf[BUFSIZE]; + uint16_t *buf; + static uint64_t samples_to_send, expected_samplenum, sending_now; + int64_t time, elapsed; + static uint16_t last_sample = 0; + uint16_t cur_sample; + int i; - /* Avoid compiler warnings. */ (void)fd; (void)revents; - do { - g_io_channel_read_chars(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_bus(session_data, &packet); - samples_received += z; - } - } while (z > 0); + if (!(buf = g_try_malloc(BUFSIZE*sizeof(uint16_t)))) { + sr_err("buf for receive_data malloc failed."); + return FALSE; + } + + /* How many "virtual" samples should we have collected by now? */ + time = g_get_monotonic_time(); + elapsed = time - devc->starttime; + devc->starttime = time; + expected_samplenum = elapsed * devc->cur_samplerate / 1000000; + /* Of those, how many do we still have to send? */ + //samples_to_send = (expected_samplenum - devc->samples_counter) / CONST_LEN * CONST_LEN; + samples_to_send = expected_samplenum / CONST_LEN * CONST_LEN; + + if (devc->limit_samples) { + if (sdi->mode == LOGIC) + samples_to_send = MIN(samples_to_send, + devc->limit_samples - devc->samples_counter); + else if (sdi->mode == ANALOG) + samples_to_send = MIN(samples_to_send, + devc->limit_samples); + } + + while (samples_to_send > 0) { + sending_now = MIN(samples_to_send, BUFSIZE); + samples_generator(buf, sending_now, devc); + + if (devc->trigger_stage != 0) { + for (i = 0; i < sending_now; i++) { + if (devc->trigger_edge == 0) { + if ((*(buf + i) | devc->trigger_mask) == + (devc->trigger_value | devc->trigger_mask)) { + devc->trigger_stage = 0; + break; + } + } else { + cur_sample = *(buf + i); + if (((last_sample & devc->trigger_edge) == + (~devc->trigger_value & devc->trigger_edge)) && + ((cur_sample | devc->trigger_mask) == + (devc->trigger_value | devc->trigger_mask)) && + ((cur_sample & devc->trigger_edge) == + (devc->trigger_value & devc->trigger_edge))) { + devc->trigger_stage = 0; + break; + } + last_sample = cur_sample; + } + } + if (devc->trigger_stage == 0) { + struct ds_trigger_pos demo_trigger_pos; + demo_trigger_pos.real_pos = i; + packet.type = SR_DF_TRIGGER; + packet.payload = &demo_trigger_pos; + sr_session_send(sdi, &packet); + } + } + + if (devc->trigger_stage == 0){ + samples_to_send -= sending_now; + if (sdi->mode == LOGIC) { + packet.type = SR_DF_LOGIC; + packet.payload = &logic; + logic.length = sending_now * (NUM_PROBES >> 3); + logic.unitsize = (NUM_PROBES >> 3); + logic.data = buf; + } else if (sdi->mode == ANALOG) { + packet.type = SR_DF_ANALOG; + packet.payload = &analog; + analog.probes = sdi->probes; + analog.num_samples = sending_now; + analog.mq = SR_MQ_VOLTAGE; + analog.unit = SR_UNIT_VOLT; + analog.mqflags = SR_MQFLAG_AC; + analog.data = buf; + } + + sr_session_send(sdi, &packet); + if (sdi->mode == LOGIC) + devc->samples_counter += sending_now; + else if (sdi->mode == ANALOG) + devc->samples_counter = (devc->samples_counter + sending_now) % devc->limit_samples; + } else { + break; + } + } - if (!thread_running && z <= 0) { - /* Make sure we don't receive more packets. */ - g_io_channel_close(channels[0]); + if (sdi->mode == LOGIC && + devc->limit_samples && + devc->samples_counter >= devc->limit_samples) { + sr_info("Requested number of samples reached."); + hw_dev_acquisition_stop(sdi, NULL); + g_free(buf); + return TRUE; + } - /* Send last packet. */ - packet.type = SR_DF_END; - sr_session_bus(session_data, &packet); - - return FALSE; - } + g_free(buf); return TRUE; } -static int hw_start_acquisition(int device_index, gpointer session_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 databag *mydata; - - /* TODO: 'mydata' is never g_free()'d? */ - if (!(mydata = g_try_malloc(sizeof(struct databag)))) { - sr_err("demo: %s: mydata malloc failed", __func__); - return SR_ERR_MALLOC; - } - - mydata->sample_generator = default_pattern; - mydata->session_data = session_data; - mydata->device_index = device_index; - mydata->samples_counter = 0; - - if (pipe(mydata->pipe_fds)) { + struct dev_context *const devc = sdi->priv; + + (void)cb_data; + + if (sdi->status != SR_ST_ACTIVE) + return SR_ERR_DEV_CLOSED; + + //devc->cb_data = cb_data; + devc->samples_counter = 0; + devc->stop = FALSE; + + /* + * trigger setting + */ + if (!trigger->trigger_en || sdi->mode == ANALOG) { + devc->trigger_stage = 0; + } else { + devc->trigger_mask = ds_trigger_get_mask0(TriggerStages); + devc->trigger_value = ds_trigger_get_value0(TriggerStages); + devc->trigger_edge = ds_trigger_get_edge0(TriggerStages); + if (devc->trigger_edge != 0) + devc->trigger_stage = 2; + else + devc->trigger_stage = 1; + } + + /* + * 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("demo: %s: pipe() failed", __func__); + sr_err("%s: pipe() failed", __func__); return SR_ERR; } - channels[0] = g_io_channel_unix_new(mydata->pipe_fds[0]); - channels[1] = g_io_channel_unix_new(mydata->pipe_fds[1]); + devc->channel = g_io_channel_unix_new(devc->pipe_fds[0]); + + g_io_channel_set_flags(devc->channel, 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(devc->channel, NULL, NULL); /* Make channels to unbuffered. */ - g_io_channel_set_buffered(channels[0], FALSE); - g_io_channel_set_buffered(channels[1], FALSE); - - sr_source_add(mydata->pipe_fds[0], G_IO_IN | G_IO_ERR, 40, - receive_data, session_data); - - /* Run the demo thread. */ - g_thread_init(NULL); - /* This must to be done between g_thread_init() & g_thread_create(). */ - mydata->timer = g_timer_new(); - thread_running = 1; - my_thread = - g_thread_create((GThreadFunc)thread_func, mydata, TRUE, NULL); - if (!my_thread) { - sr_err("demo: %s: g_thread_create failed", __func__); - return SR_ERR; /* TODO */ - } + g_io_channel_set_buffered(devc->channel, FALSE); - if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) { - sr_err("demo: %s: packet malloc failed", __func__); - return SR_ERR_MALLOC; - } + sr_session_source_add_channel(devc->channel, G_IO_IN | G_IO_ERR, + 100, receive_data, sdi); - if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) { - sr_err("demo: %s: header malloc failed", __func__); - return SR_ERR_MALLOC; - } + /* Send header packet to the session bus. */ + //std_session_send_df_header(cb_data, LOG_PREFIX); + std_session_send_df_header(sdi, LOG_PREFIX); - packet->type = SR_DF_HEADER; - packet->payload = header; - header->feed_version = 1; - gettimeofday(&header->starttime, NULL); - header->samplerate = cur_samplerate; - header->num_logic_probes = NUM_PROBES; - sr_session_bus(session_data, 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; } -static int hw_stop_acquisition(int device_index, gpointer session_data) +static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) { - /* Avoid compiler warnings. */ - (void)device_index; - (void)session_data; + struct dev_context *const devc = sdi->priv; + struct sr_datafeed_packet packet; - /* Stop generate thread. */ - thread_running = 0; + (void)cb_data; + + sr_dbg("Stopping aquisition."); + + devc->stop = TRUE; + sr_session_source_remove_channel(devc->channel); + g_io_channel_shutdown(devc->channel, FALSE, NULL); + g_io_channel_unref(devc->channel); + devc->channel = NULL; + + /* Send last packet. */ + packet.type = SR_DF_END; + sr_session_send(sdi, &packet); return SR_OK; } -SR_PRIV struct sr_device_plugin demo_plugin_info = { +static int hw_dev_test(struct sr_dev_inst *sdi) +{ + if (sdi) + return SR_OK; + else + return SR_ERR; +} + +SR_PRIV struct sr_dev_driver demo_driver_info = { .name = "demo", .longname = "Demo driver and pattern generator", .api_version = 1, .init = hw_init, .cleanup = hw_cleanup, - .opendev = hw_opendev, - .closedev = hw_closedev, - .get_device_info = hw_get_device_info, - .get_status = hw_get_status, - .get_capabilities = hw_get_capabilities, - .set_configuration = hw_set_configuration, - .start_acquisition = hw_start_acquisition, - .stop_acquisition = hw_stop_acquisition, + .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, + .dev_test = hw_dev_test, + .dev_acquisition_start = hw_dev_acquisition_start, + .dev_acquisition_stop = hw_dev_acquisition_stop, + .priv = NULL, };