]> sigrok.org Git - libsigrok.git/blobdiff - hardware/demo/demo.c
build: Portability fixes.
[libsigrok.git] / hardware / demo / demo.c
index 24c91838a717208e5001faf71163d9da0ffec710..b2f3a50915227ee4b96cd4b9dd7d45b2a0a1262f 100644 (file)
@@ -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 <uwe@hermann-uwe.de>
  * Copyright (C) 2011 Olivier Fauchon <olivier@aixmarseille.com>
+ * Copyright (C) 2012 Alexandru Gagniuc <mr.nuke.me@gmail.com>
  *
  * 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,6 +23,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+#include <math.h>
 #ifdef _WIN32
 #include <io.h>
 #include <fcntl.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* TODO: Number of probes should be configurable. */
-#define NUM_PROBES             8
+#define LOG_PREFIX "demo"
 
-#define DEMONAME               "Demo device"
+#define DEFAULT_NUM_LOGIC_CHANNELS     8
+#define DEFAULT_NUM_ANALOG_CHANNELS    4
 
-/* The size of chunks to send through the session bus. */
-/* TODO: Should be configurable. */
-#define BUFSIZE                4096
+/* The size in bytes of chunks to send through the session bus. */
+#define LOGIC_BUFSIZE        4096
+/* Size of the analog pattern space per channel. */
+#define ANALOG_BUFSIZE       4096
 
-/* Supported patterns which we can generate */
+#define ANALOG_AMPLITUDE 25
+#define ANALOG_SAMPLES_PER_PERIOD 20
+
+/* Logic patterns we can generate. */
 enum {
        /**
-        * Pattern which spells "sigrok" using '0's (with '1's as "background")
-        * when displayed using the 'bits' output format.
+        * Spells "sigrok" across 8 channels using '0's (with '1's as
+        * "background") when displayed using the 'bits' output format.
+        * The pattern is repeated every 8 channels, shifted to the right
+        * in time by one bit.
         */
        PATTERN_SIGROK,
 
-       /** Pattern which consists of (pseudo-)random values on all probes. */
+       /** Pseudo-random values on all channels. */
        PATTERN_RANDOM,
 
        /**
-        * Pattern which consists of incrementing numbers.
-        * TODO: Better description.
+        * Incrementing number across 8 channels. The pattern is repeated
+        * every 8 channels, shifted to the right in time by one bit.
         */
        PATTERN_INC,
 
-       /** Pattern where all probes have a low logic state. */
+       /** All channels have a low logic state. */
        PATTERN_ALL_LOW,
 
-       /** Pattern where all probes have a high logic state. */
+       /** All channels have a high logic state. */
        PATTERN_ALL_HIGH,
 };
 
-/* FIXME: Should not be global. */
+/* Analog patterns we can generate. */
+enum {
+       /**
+        * Square wave.
+        */
+       PATTERN_SQUARE,
+       PATTERN_SINE,
+       PATTERN_TRIANGLE,
+       PATTERN_SAWTOOTH,
+};
 
-struct context {
+static const char *logic_pattern_str[] = {
+       "sigrok",
+       "random",
+       "incremental",
+       "all-low",
+       "all-high",
+};
+
+static const char *analog_pattern_str[] = {
+       "square",
+       "sine",
+       "triangle",
+       "sawtooth",
+};
+
+struct analog_gen {
+       int pattern;
+       float pattern_data[ANALOG_BUFSIZE];
+       unsigned int num_samples;
+       struct sr_datafeed_analog packet;
+};
+
+/* Private, per-device-instance driver context. */
+struct dev_context {
        int pipe_fds[2];
-       GIOChannel *channels[2];
-       uint8_t sample_generator;
-       uint8_t thread_running;
-       uint64_t samples_counter;
-       int dev_index;
-       void *session_dev_id;
-       GTimer *timer;
+       GIOChannel *channel;
+       uint64_t cur_samplerate;
+       uint64_t limit_samples;
+       uint64_t limit_msec;
+       uint64_t logic_counter;
+       uint64_t analog_counter;
+       int64_t starttime;
+       uint64_t step;
+       /* Logic */
+       int32_t num_logic_channels;
+       unsigned int logic_unitsize;
+       /* There is only ever one logic channel group, so its pattern goes here. */
+       uint8_t logic_pattern;
+       unsigned char logic_data[LOGIC_BUFSIZE];
+       /* Analog */
+       int32_t num_analog_channels;
+       GSList *analog_channel_groups;
 };
 
-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,
+static const int32_t scanopts[] = {
+       SR_CONF_NUM_LOGIC_CHANNELS,
+       SR_CONF_NUM_ANALOG_CHANNELS,
 };
 
-static const struct sr_samplerates samplerates = {
-       SR_HZ(1),
-       SR_GHZ(1),
-       SR_HZ(1),
-       NULL,
+static const int devopts[] = {
+       SR_CONF_LOGIC_ANALYZER,
+       SR_CONF_DEMO_DEV,
+       SR_CONF_SAMPLERATE,
+       SR_CONF_LIMIT_SAMPLES,
+       SR_CONF_LIMIT_MSEC,
 };
 
-static const char *pattern_strings[] = {
-       "sigrok",
-       "random",
-       "incremental",
-       "all-low",
-       "all-high",
-       NULL,
+static const int devopts_cg[] = {
+       SR_CONF_PATTERN_MODE,
 };
 
-/* 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",
-       NULL,
+static const uint64_t samplerates[] = {
+       SR_HZ(1),
+       SR_GHZ(1),
+       SR_HZ(1),
 };
 
 static uint8_t pattern_sigrok[] = {
@@ -126,389 +160,604 @@ static uint8_t pattern_sigrok[] = {
        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 *ddi = &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 struct sr_dev_driver *di = &demo_driver_info;
 
-static int hw_dev_acquisition_stop(int dev_index, void *cb_data);
+static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
 
-static int hw_init(void)
+
+static int init(struct sr_context *sr_ctx)
 {
+       return std_init(sr_ctx, di, LOG_PREFIX);
+}
 
-       /* Nothing to do. */
+static void generate_analog_pattern(const struct sr_channel_group *cg, uint64_t sample_rate)
+{
+       struct analog_gen *ag;
+       double t, frequency;
+       float value;
+       unsigned int num_samples, i;
+       int last_end;
+
+       ag = cg->priv;
+       num_samples = ANALOG_BUFSIZE / sizeof(float);
+
+       sr_dbg("Generating %s pattern for channel group %s",
+              analog_pattern_str[ag->pattern], cg->name);
+
+       switch (ag->pattern) {
+       case PATTERN_SQUARE:
+               value = ANALOG_AMPLITUDE;
+               last_end = 0;
+               for (i = 0; i < num_samples; i++) {
+                       if (i % 5 == 0)
+                               value = -value;
+                       if (i % 10 == 0)
+                               last_end = i - 1;
+                       ag->pattern_data[i] = value;
+               }
+               ag->num_samples = last_end;
+               break;
 
-       return SR_OK;
+       case PATTERN_SINE:
+               frequency = (double) sample_rate / ANALOG_SAMPLES_PER_PERIOD;
+
+               /* Make sure the number of samples we put out is an integer
+                * multiple of our period size */
+               /* FIXME we actually need only one period. A ringbuffer would be
+                * usefull here.*/
+               while (num_samples % ANALOG_SAMPLES_PER_PERIOD != 0)
+                       num_samples--;
+
+               for (i = 0; i < num_samples; i++) {
+                       t = (double) i / (double) sample_rate;
+                       ag->pattern_data[i] = ANALOG_AMPLITUDE *
+                                               sin(2 * M_PI * frequency * t);
+               }
+
+               ag->num_samples = num_samples;
+               break;
+
+       case PATTERN_TRIANGLE:
+               frequency = (double) sample_rate / ANALOG_SAMPLES_PER_PERIOD;
+
+               while (num_samples % ANALOG_SAMPLES_PER_PERIOD != 0)
+                       num_samples--;
+
+               for (i = 0; i < num_samples; i++) {
+                       t = (double) i / (double) sample_rate;
+                       ag->pattern_data[i] = (2 * ANALOG_AMPLITUDE / M_PI) *
+                                               asin(sin(2 * M_PI * frequency * t));
+               }
+
+               ag->num_samples = num_samples;
+               break;
+
+       case PATTERN_SAWTOOTH:
+               frequency = (double) sample_rate / ANALOG_SAMPLES_PER_PERIOD;
+
+               while (num_samples % ANALOG_SAMPLES_PER_PERIOD != 0)
+                       num_samples--;
+
+               for (i = 0; i < num_samples; i++) {
+                       t = (double) i / (double) sample_rate;
+                       ag->pattern_data[i] = 2 * ANALOG_AMPLITUDE *
+                                               ((t * frequency) - floor(0.5f + t * frequency));
+               }
+
+               ag->num_samples = num_samples;
+               break;
+       }
 }
 
-static GSList *hw_scan(GSList *options)
+static GSList *scan(GSList *options)
 {
+       struct drv_context *drvc;
+       struct dev_context *devc;
        struct sr_dev_inst *sdi;
-       GSList *devices;
+       struct sr_channel *ch;
+       struct sr_channel_group *cg;
+       struct sr_config *src;
+       struct analog_gen *ag;
+       GSList *devices, *l;
+       int num_logic_channels, num_analog_channels, pattern, i;
+       char channel_name[16];
+
+       drvc = di->priv;
+
+       num_logic_channels = DEFAULT_NUM_LOGIC_CHANNELS;
+       num_analog_channels = DEFAULT_NUM_ANALOG_CHANNELS;
+       for (l = options; l; l = l->next) {
+               src = l->data;
+               switch (src->key) {
+               case SR_CONF_NUM_LOGIC_CHANNELS:
+                       num_logic_channels = g_variant_get_int32(src->data);
+                       break;
+               case SR_CONF_NUM_ANALOG_CHANNELS:
+                       num_analog_channels = g_variant_get_int32(src->data);
+                       break;
+               }
+       }
 
-       (void)options;
        devices = NULL;
-
-       sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, DEMONAME, NULL, NULL);
+       sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, "Demo device", 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;
+
+       if (!(devc = g_try_malloc(sizeof(struct dev_context)))) {
+               sr_err("Device context malloc failed.");
+               return NULL;
+       }
+       devc->cur_samplerate = SR_KHZ(200);
+       devc->limit_samples = 0;
+       devc->limit_msec = 0;
+       devc->step = 0;
+       devc->num_logic_channels = num_logic_channels;
+       devc->logic_unitsize = (devc->num_logic_channels + 7) / 8;
+       devc->logic_pattern = PATTERN_SIGROK;
+       devc->num_analog_channels = num_analog_channels;
+       devc->analog_channel_groups = NULL;
+
+       /* Logic channels, all in one channel group. */
+       if (!(cg = g_try_malloc(sizeof(struct sr_channel_group))))
+               return NULL;
+       cg->name = g_strdup("Logic");
+       cg->channels = NULL;
+       cg->priv = NULL;
+       for (i = 0; i < num_logic_channels; i++) {
+               sprintf(channel_name, "D%d", i);
+               if (!(ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, channel_name)))
+                       return NULL;
+               sdi->channels = g_slist_append(sdi->channels, ch);
+               cg->channels = g_slist_append(cg->channels, ch);
+       }
+       sdi->channel_groups = g_slist_append(NULL, cg);
+
+       /* Analog channels, channel groups and pattern generators. */
+
+       pattern = 0;
+       for (i = 0; i < num_analog_channels; i++) {
+               sprintf(channel_name, "A%d", i);
+               if (!(ch = sr_channel_new(i + num_logic_channels,
+                               SR_CHANNEL_ANALOG, TRUE, channel_name)))
+                       return NULL;
+               sdi->channels = g_slist_append(sdi->channels, ch);
+
+               /* Every analog channel gets its own channel group. */
+               if (!(cg = g_try_malloc(sizeof(struct sr_channel_group))))
+                       return NULL;
+               cg->name = g_strdup(channel_name);
+               cg->channels = g_slist_append(NULL, ch);
+
+               /* Every channel group gets a generator struct. */
+               if (!(ag = g_try_malloc(sizeof(struct analog_gen))))
+                       return NULL;
+               ag->packet.channels = cg->channels;
+               ag->packet.mq = 0;
+               ag->packet.mqflags = 0;
+               ag->packet.unit = SR_UNIT_VOLT;
+               ag->packet.data = ag->pattern_data;
+               ag->pattern = pattern;
+               cg->priv = ag;
+
+               sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
+               devc->analog_channel_groups = g_slist_append(devc->analog_channel_groups, cg);
+
+               if (++pattern == ARRAY_SIZE(analog_pattern_str))
+                       pattern = 0;
        }
-       sdi->driver = ddi;
 
+       sdi->priv = devc;
        devices = g_slist_append(devices, sdi);
-       ddi->instances = g_slist_append(ddi->instances, sdi);
+       drvc->instances = g_slist_append(drvc->instances, sdi);
 
        return devices;
 }
 
-static int hw_dev_open(int dev_index)
+static GSList *dev_list(void)
 {
-       /* Avoid compiler warnings. */
-       (void)dev_index;
+       return ((struct drv_context *)(di->priv))->instances;
+}
 
-       /* Nothing needed so far. */
+static int dev_open(struct sr_dev_inst *sdi)
+{
+       sdi->status = SR_ST_ACTIVE;
 
        return SR_OK;
 }
 
-static int hw_dev_close(int dev_index)
+static int dev_close(struct sr_dev_inst *sdi)
 {
-       /* Avoid compiler warnings. */
-       (void)dev_index;
-
-       /* Nothing needed so far. */
+       sdi->status = SR_ST_INACTIVE;
 
        return SR_OK;
 }
 
-static int hw_cleanup(void)
+static int cleanup(void)
 {
-       /* Nothing needed so far. */
-       return SR_OK;
+       return std_dev_clear(di, NULL);
 }
 
-static int hw_info_get(int info_id, const void **data,
-       const struct sr_dev_inst *sdi)
+static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
+               const struct sr_channel_group *cg)
 {
+       struct dev_context *devc;
+       struct sr_channel *ch;
+       struct analog_gen *ag;
+       int pattern;
 
-       switch (info_id) {
-       case SR_DI_INST:
-               *data = sdi;
-               break;
-       case SR_DI_HWCAPS:
-               *data = hwcaps;
+       if (!sdi)
+               return SR_ERR_ARG;
+
+       devc = sdi->priv;
+       switch (id) {
+       case SR_CONF_SAMPLERATE:
+               *data = g_variant_new_uint64(devc->cur_samplerate);
                break;
-       case SR_DI_NUM_PROBES:
-               *data = GINT_TO_POINTER(NUM_PROBES);
+       case SR_CONF_LIMIT_SAMPLES:
+               *data = g_variant_new_uint64(devc->limit_samples);
                break;
-       case SR_DI_PROBE_NAMES:
-               *data = probe_names;
+       case SR_CONF_LIMIT_MSEC:
+               *data = g_variant_new_uint64(devc->limit_msec);
                break;
-       case SR_DI_SAMPLERATES:
-               *data = &samplerates;
+       case SR_CONF_PATTERN_MODE:
+               if (!cg)
+                       return SR_ERR_CHANNEL_GROUP;
+               ch = cg->channels->data;
+               if (ch->type == SR_CHANNEL_LOGIC) {
+                       pattern = devc->logic_pattern;
+                       *data = g_variant_new_string(logic_pattern_str[pattern]);
+               } else if (ch->type == SR_CHANNEL_ANALOG) {
+                       ag = cg->priv;
+                       pattern = ag->pattern;
+                       *data = g_variant_new_string(analog_pattern_str[pattern]);
+               } else
+                       return SR_ERR_BUG;
                break;
-       case SR_DI_CUR_SAMPLERATE:
-               *data = &cur_samplerate;
+       case SR_CONF_NUM_LOGIC_CHANNELS:
+               *data = g_variant_new_int32(devc->num_logic_channels);
                break;
-       case SR_DI_PATTERNS:
-               *data = &pattern_strings;
+       case SR_CONF_NUM_ANALOG_CHANNELS:
+               *data = g_variant_new_int32(devc->num_analog_channels);
                break;
        default:
-               return SR_ERR_ARG;
+               return SR_ERR_NA;
        }
 
        return SR_OK;
 }
 
-static int hw_dev_status_get(int dev_index)
+static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
+               const struct sr_channel_group *cg)
 {
-       /* Avoid compiler warnings. */
-       (void)dev_index;
-
-       return SR_ST_ACTIVE;
-}
-
-static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
-               const void *value)
-{
-       int ret;
+       struct dev_context *devc;
+       struct analog_gen *ag;
+       struct sr_channel *ch;
+       int pattern, ret;
+       unsigned int i;
        const char *stropt;
 
-       (void)sdi;
+       devc = sdi->priv;
 
-       if (hwcap == SR_HWCAP_PROBECONFIG) {
-               /* Nothing to do, but must be supported */
-               ret = SR_OK;
-       } else if (hwcap == SR_HWCAP_SAMPLERATE) {
-               cur_samplerate = *(const uint64_t *)value;
-               sr_dbg("demo: %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__,
-                      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;
-       } else if (hwcap == 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 {
-                       ret = SR_ERR;
-               }
-               sr_dbg("demo: %s: setting pattern to %d", __func__,
-                      default_pattern);
-       } else {
-               ret = SR_ERR;
-       }
-
-       return ret;
-}
+       if (sdi->status != SR_ST_ACTIVE)
+               return SR_ERR_DEV_CLOSED;
 
-static void samples_generator(uint8_t *buf, uint64_t size, void *data)
-{
-       static uint64_t p = 0;
-       struct context *ctx = data;
-       uint64_t i;
-
-       /* TODO: Needed? */
-       memset(buf, 0, size);
-
-       switch (ctx->sample_generator) {
-       case PATTERN_SIGROK: /* sigrok pattern */
-               for (i = 0; i < size; i++) {
-                       *(buf + i) = ~(pattern_sigrok[p] >> 1);
-                       if (++p == 64)
-                               p = 0;
-               }
+       ret = SR_OK;
+       switch (id) {
+       case SR_CONF_SAMPLERATE:
+               devc->cur_samplerate = g_variant_get_uint64(data);
+               sr_dbg("Setting samplerate to %" PRIu64, devc->cur_samplerate);
                break;
-       case PATTERN_RANDOM: /* Random */
-               for (i = 0; i < size; i++)
-                       *(buf + i) = (uint8_t)(rand() & 0xff);
+       case SR_CONF_LIMIT_SAMPLES:
+               devc->limit_msec = 0;
+               devc->limit_samples = g_variant_get_uint64(data);
+               sr_dbg("Setting sample limit to %" PRIu64, devc->limit_samples);
                break;
-       case PATTERN_INC: /* Simple increment */
-               for (i = 0; i < size; i++)
-                       *(buf + i) = i;
+       case SR_CONF_LIMIT_MSEC:
+               devc->limit_msec = g_variant_get_uint64(data);
+               devc->limit_samples = 0;
+               sr_dbg("Setting time limit to %" PRIu64"ms", devc->limit_msec);
                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_PATTERN_MODE:
+               if (!cg)
+                       return SR_ERR_CHANNEL_GROUP;
+               stropt = g_variant_get_string(data, NULL);
+               ch = cg->channels->data;
+               pattern = -1;
+               if (ch->type == SR_CHANNEL_LOGIC) {
+                       for (i = 0; i < ARRAY_SIZE(logic_pattern_str); i++) {
+                               if (!strcmp(stropt, logic_pattern_str[i])) {
+                                       pattern = i;
+                                       break;
+                               }
+                       }
+                       if (pattern == -1)
+                               return SR_ERR_ARG;
+                       devc->logic_pattern = pattern;
+
+                       /* Might as well do this now, these are static. */
+                       if (pattern == PATTERN_ALL_LOW)
+                               memset(devc->logic_data, 0x00, LOGIC_BUFSIZE);
+                       else if (pattern == PATTERN_ALL_HIGH)
+                               memset(devc->logic_data, 0xff, LOGIC_BUFSIZE);
+                       sr_dbg("Setting logic pattern to %s",
+                                       logic_pattern_str[pattern]);
+               } else if (ch->type == SR_CHANNEL_ANALOG) {
+                       for (i = 0; i < ARRAY_SIZE(analog_pattern_str); i++) {
+                               if (!strcmp(stropt, analog_pattern_str[i])) {
+                                       pattern = i;
+                                       break;
+                               }
+                       }
+                       if (pattern == -1)
+                               return SR_ERR_ARG;
+                       sr_dbg("Setting analog pattern for channel group %s to %s",
+                                       cg->name, analog_pattern_str[pattern]);
+                       ag = cg->priv;
+                       ag->pattern = pattern;
+               } else
+                       return SR_ERR_BUG;
                break;
        default:
-               sr_err("demo: %s: unknown pattern %d", __func__,
-                      ctx->sample_generator);
-               break;
+               ret = SR_ERR_NA;
        }
+
+       return ret;
 }
 
-/* Thread function */
-static void thread_func(void *data)
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
+               const struct sr_channel_group *cg)
 {
-       struct context *ctx = data;
-       uint8_t buf[BUFSIZE];
-       uint64_t nb_to_send = 0;
-       int bytes_written;
-       double time_cur, time_last, time_diff;
+       struct sr_channel *ch;
+       GVariant *gvar;
+       GVariantBuilder gvb;
 
-       time_last = g_timer_elapsed(ctx->timer, NULL);
-
-       while (thread_running) {
-               /* Rate control */
-               time_cur = g_timer_elapsed(ctx->timer, NULL);
+       (void)sdi;
 
-               time_diff = time_cur - time_last;
-               time_last = time_cur;
+       if (key == SR_CONF_SCAN_OPTIONS) {
+               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+                               scanopts, ARRAY_SIZE(scanopts), sizeof(int32_t));
+               return SR_OK;
+       }
 
-               nb_to_send = cur_samplerate * time_diff;
+       if (!sdi)
+               return SR_ERR_ARG;
 
-               if (limit_samples) {
-                       nb_to_send = MIN(nb_to_send,
-                                     limit_samples - ctx->samples_counter);
+       if (!cg) {
+               switch (key) {
+               case SR_CONF_DEVICE_OPTIONS:
+                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+                                       devopts, ARRAY_SIZE(devopts), sizeof(int32_t));
+                       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));
+                       g_variant_builder_add(&gvb, "{sv}", "samplerate-steps", gvar);
+                       *data = g_variant_builder_end(&gvb);
+                       break;
+               default:
+                       return SR_ERR_NA;
                }
+       } else {
+               ch = cg->channels->data;
+               switch (key) {
+               case SR_CONF_DEVICE_OPTIONS:
+                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+                                       devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(int32_t));
+                       break;
+               case SR_CONF_PATTERN_MODE:
+                       if (ch->type == SR_CHANNEL_LOGIC)
+                               *data = g_variant_new_strv(logic_pattern_str,
+                                               ARRAY_SIZE(logic_pattern_str));
+                       else if (ch->type == SR_CHANNEL_ANALOG)
+                               *data = g_variant_new_strv(analog_pattern_str,
+                                               ARRAY_SIZE(analog_pattern_str));
+                       else
+                               return SR_ERR_BUG;
+                       break;
+               default:
+                       return SR_ERR_NA;
+               }
+       }
 
-               /* 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);
-                       ctx->samples_counter += nb_to_send;
+       return SR_OK;
+}
 
-                       g_io_channel_write_chars(ctx->channels[1], (gchar *)&buf,
-                               nb_to_send, (gsize *)&bytes_written, NULL);
+static void logic_generator(struct sr_dev_inst *sdi, uint64_t size)
+{
+       struct dev_context *devc;
+       uint64_t i, j;
+       uint8_t pat;
+
+       devc = sdi->priv;
+
+       switch (devc->logic_pattern) {
+       case PATTERN_SIGROK:
+               memset(devc->logic_data, 0x00, size);
+               for (i = 0; i < size; i += devc->logic_unitsize) {
+                       for (j = 0; j < devc->logic_unitsize; j++) {
+                               pat = pattern_sigrok[(devc->step + j) % sizeof(pattern_sigrok)] >> 1;
+                               devc->logic_data[i + j] = ~pat;
+                       }
+                       devc->step++;
                }
-
-               /* Check if we're done. */
-               if ((limit_msec && time_cur * 1000 > limit_msec) ||
-                   (limit_samples && ctx->samples_counter >= limit_samples))
-               {
-                       close(ctx->pipe_fds[1]);
-                       thread_running = 0;
+               break;
+       case PATTERN_RANDOM:
+               for (i = 0; i < size; i++)
+                       devc->logic_data[i] = (uint8_t)(rand() & 0xff);
+               break;
+       case PATTERN_INC:
+               for (i = 0; i < size; i++) {
+                       for (j = 0; j < devc->logic_unitsize; j++) {
+                               devc->logic_data[i + j] = devc->step;
+                       }
+                       devc->step++;
                }
-
-               g_usleep(10);
+               break;
+       case PATTERN_ALL_LOW:
+       case PATTERN_ALL_HIGH:
+               /* These were set when the pattern mode was selected. */
+               break;
+       default:
+               sr_err("Unknown pattern: %d.", devc->logic_pattern);
+               break;
        }
 }
 
 /* Callback handling data */
-static int receive_data(int fd, int revents, void *cb_data)
+static int prepare_data(int fd, int revents, void *cb_data)
 {
-       struct context *ctx = cb_data;
+       struct sr_dev_inst *sdi;
+       struct dev_context *devc;
        struct sr_datafeed_packet packet;
        struct sr_datafeed_logic logic;
-       static uint64_t samples_received = 0;
-       unsigned char c[BUFSIZE];
-       gsize z;
+       struct sr_channel_group *cg;
+       struct analog_gen *ag;
+       GSList *l;
+       uint64_t logic_todo, analog_todo, expected_samplenum, analog_samples, sending_now;
+       int64_t time, elapsed;
 
-       /* Avoid compiler warnings. */
        (void)fd;
        (void)revents;
 
-       do {
-               g_io_channel_read_chars(ctx->channels[0],
-                                       (gchar *)&c, BUFSIZE, &z, NULL);
+       sdi = cb_data;
+       devc = sdi->priv;
+
+       /* How many "virtual" samples should we have collected by now? */
+       time = g_get_monotonic_time();
+       elapsed = time - devc->starttime;
+       expected_samplenum = elapsed * devc->cur_samplerate / 1000000;
 
-               if (z > 0) {
+       /* Of those, how many do we still have to send? */
+       logic_todo = MIN(expected_samplenum, devc->limit_samples) - devc->logic_counter;
+       analog_todo = MIN(expected_samplenum, devc->limit_samples) - devc->analog_counter;
+
+       while (logic_todo || analog_todo) {
+               /* Logic */
+               if (devc->num_logic_channels > 0 && logic_todo > 0) {
+                       sending_now = MIN(logic_todo,
+                                       LOGIC_BUFSIZE / devc->logic_unitsize);
+                       logic_generator(sdi, sending_now * devc->logic_unitsize);
                        packet.type = SR_DF_LOGIC;
                        packet.payload = &logic;
-                       logic.length = z;
-                       logic.unitsize = 1;
-                       logic.data = c;
-                       sr_session_send(ctx->session_dev_id, &packet);
-                       samples_received += z;
+                       logic.length = sending_now * devc->logic_unitsize;
+                       logic.unitsize = devc->logic_unitsize;
+                       logic.data = devc->logic_data;
+                       sr_session_send(sdi, &packet);
+                       logic_todo -= sending_now;
+                       devc->logic_counter += sending_now;
                }
-       } while (z > 0);
-
-       if (!thread_running && z <= 0) {
-               /* Make sure we don't receive more packets. */
-               g_io_channel_shutdown(ctx->channels[0], FALSE, NULL);
 
-               /* Send last packet. */
-               packet.type = SR_DF_END;
-               sr_session_send(ctx->session_dev_id, &packet);
+               /* Analog, one channel at a time */
+               if (devc->num_analog_channels > 0 && analog_todo > 0) {
+                       sending_now = 0;
+                       for (l = devc->analog_channel_groups; l; l = l->next) {
+                               cg = l->data;
+                               ag = cg->priv;
+                               packet.type = SR_DF_ANALOG;
+                               packet.payload = &ag->packet;
+
+                               /* FIXME we should make sure we output a whole
+                                * period of data before we send out again the
+                                * beginning of our buffer. A ring buffer would
+                                * help here as well */
+
+                               analog_samples = MIN(analog_todo, ag->num_samples);
+                               /* Whichever channel group gets there first. */
+                               sending_now = MAX(sending_now, analog_samples);
+                               ag->packet.num_samples = analog_samples;
+                               sr_session_send(sdi, &packet);
+                       }
+                       analog_todo -= sending_now;
+                       devc->analog_counter += sending_now;
+               }
+       }
 
-               return FALSE;
+       if (devc->logic_counter >= devc->limit_samples &&
+                       devc->analog_counter >= devc->limit_samples) {
+               sr_dbg("Requested number of samples reached.");
+               dev_acquisition_stop(sdi, cb_data);
+               return TRUE;
        }
 
        return TRUE;
 }
 
-static int hw_dev_acquisition_start(int dev_index, void *cb_data)
+static int 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 context *ctx;
-
-       /* TODO: 'ctx' is never g_free()'d? */
-       if (!(ctx = g_try_malloc(sizeof(struct context)))) {
-               sr_err("demo: %s: ctx malloc failed", __func__);
-               return SR_ERR_MALLOC;
-       }
+       GSList *l;
+       struct dev_context *devc;
+
+       (void)cb_data;
 
-       ctx->sample_generator = default_pattern;
-       ctx->session_dev_id = cb_data;
-       ctx->dev_index = dev_index;
-       ctx->samples_counter = 0;
+       if (sdi->status != SR_ST_ACTIVE)
+               return SR_ERR_DEV_CLOSED;
 
-       if (pipe(ctx->pipe_fds)) {
-               /* TODO: Better error message. */
-               sr_err("demo: %s: pipe() failed", __func__);
+       devc = sdi->priv;
+       if (devc->limit_samples == 0)
+               return SR_ERR;
+       devc->logic_counter = devc->analog_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)) {
+               sr_err("%s: pipe() failed", __func__);
                return SR_ERR;
        }
 
-       ctx->channels[0] = g_io_channel_unix_new(ctx->pipe_fds[0]);
-       ctx->channels[1] = g_io_channel_unix_new(ctx->pipe_fds[1]);
+       for (l = devc->analog_channel_groups; l; l = l->next) {
+               generate_analog_pattern(l->data, devc->cur_samplerate);
+       }
+
+       devc->channel = g_io_channel_unix_new(devc->pipe_fds[0]);
 
-       g_io_channel_set_flags(ctx->channels[0], G_IO_FLAG_NONBLOCK, NULL);
+       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(ctx->channels[0], NULL, NULL);
-       g_io_channel_set_encoding(ctx->channels[1], NULL, NULL);
+       g_io_channel_set_encoding(devc->channel, NULL, NULL);
 
        /* Make channels to unbuffered. */
-       g_io_channel_set_buffered(ctx->channels[0], FALSE);
-       g_io_channel_set_buffered(ctx->channels[1], FALSE);
-
-       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);
-       /* This must to be done between g_thread_init() & g_thread_create(). */
-       ctx->timer = g_timer_new();
-       thread_running = 1;
-       my_thread =
-           g_thread_create((GThreadFunc)thread_func, ctx, 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;
-       }
-
-       if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) {
-               sr_err("demo: %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(ctx->session_dev_id, packet);
+       sr_session_source_add_channel(sdi->session, devc->channel, G_IO_IN | G_IO_ERR,
+                       40, prepare_data, (void *)sdi);
 
-       /* 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(ctx->session_dev_id, packet);
+       /* Send header packet to the session bus. */
+       std_session_send_df_header(sdi, LOG_PREFIX);
 
-       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;
 }
 
-/* TODO: This stops acquisition on ALL devices, ignoring dev_index. */
-static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
-       /* Avoid compiler warnings. */
-       (void)dev_index;
+       struct dev_context *devc;
+       struct sr_datafeed_packet packet;
+
        (void)cb_data;
 
-       /* Stop generate thread. */
-       thread_running = 0;
+       devc = sdi->priv;
+       sr_dbg("Stopping acquisition.");
+
+       sr_session_source_remove_channel(sdi->session, 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;
 }
@@ -517,15 +766,17 @@ 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,
-       .scan = hw_scan,
-       .dev_open = hw_dev_open,
-       .dev_close = hw_dev_close,
-       .info_get = hw_info_get,
-       .dev_status_get = hw_dev_status_get,
-       .dev_config_set = hw_dev_config_set,
-       .dev_acquisition_start = hw_dev_acquisition_start,
-       .dev_acquisition_stop = hw_dev_acquisition_stop,
-       .instances = NULL,
+       .init = init,
+       .cleanup = cleanup,
+       .scan = scan,
+       .dev_list = dev_list,
+       .dev_clear = NULL,
+       .config_get = config_get,
+       .config_set = config_set,
+       .config_list = config_list,
+       .dev_open = dev_open,
+       .dev_close = dev_close,
+       .dev_acquisition_start = dev_acquisition_start,
+       .dev_acquisition_stop = dev_acquisition_stop,
+       .priv = NULL,
 };