Remove std_dev_clear() wrappers from drivers.

[libsigrok.git] / hardware / demo / demo.c

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 5123544a5ede45bee7bb8b2f4663dad6f06e4a43..a3e85c341108a395dd12e642736c7a074c49ade3 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -111,7 +111,8 @@ struct dev_context {
        uint64_t cur_samplerate;
        uint64_t limit_samples;
        uint64_t limit_msec;
-       uint64_t samples_counter;
+       uint64_t logic_counter;
+       uint64_t analog_counter;
        int64_t starttime;
        uint64_t step;
        /* Logic */
@@ -165,11 +166,6 @@ static struct sr_dev_driver *di = &demo_driver_info;
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
 
 
-static int dev_clear(void)
-{
-       return std_dev_clear(di, NULL);
-}
-
 static int init(struct sr_context *sr_ctx)
 {
        return std_init(sr_ctx, di, LOG_PREFIX);
@@ -205,7 +201,7 @@ static void generate_analog_pattern(const struct sr_probe_group *probe_group, ui
                break;
 
        case PATTERN_SINE:
-               frequency = sample_rate / ANALOG_SAMPLES_PER_PERIOD;
+               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 */
@@ -224,7 +220,7 @@ static void generate_analog_pattern(const struct sr_probe_group *probe_group, ui
                break;
 
        case PATTERN_TRIANGLE:
-               frequency = sample_rate / ANALOG_SAMPLES_PER_PERIOD;
+               frequency = (double) sample_rate / ANALOG_SAMPLES_PER_PERIOD;
 
                while (num_samples % ANALOG_SAMPLES_PER_PERIOD != 0)
                        num_samples--;
@@ -239,7 +235,7 @@ static void generate_analog_pattern(const struct sr_probe_group *probe_group, ui
                break;
 
        case PATTERN_SAWTOOTH:
-               frequency = sample_rate / ANALOG_SAMPLES_PER_PERIOD;
+               frequency = (double) sample_rate / ANALOG_SAMPLES_PER_PERIOD;
 
                while (num_samples % ANALOG_SAMPLES_PER_PERIOD != 0)
                        num_samples--;
@@ -265,7 +261,7 @@ static GSList *scan(GSList *options)
        struct sr_config *src;
        struct analog_gen *ag;
        GSList *devices, *l;
-       int num_logic_probes, num_analog_probes, i;
+       int num_logic_probes, num_analog_probes, pattern, i;
        char probe_name[16];
 
        drvc = di->priv;
@@ -322,6 +318,8 @@ static GSList *scan(GSList *options)
        sdi->probe_groups = g_slist_append(NULL, pg);
 
        /* Analog probes, probe groups and pattern generators. */
+
+       pattern = 0;
        for (i = 0; i < num_analog_probes; i++) {
                sprintf(probe_name, "A%d", i);
                if (!(probe = sr_probe_new(i + num_logic_probes,
@@ -343,11 +341,14 @@ static GSList *scan(GSList *options)
                ag->packet.mqflags = 0;
                ag->packet.unit = SR_UNIT_VOLT;
                ag->packet.data = ag->pattern_data;
-               ag->pattern = PATTERN_SINE;
+               ag->pattern = pattern;
                pg->priv = ag;
 
                sdi->probe_groups = g_slist_append(sdi->probe_groups, pg);
                devc->analog_probe_groups = g_slist_append(devc->analog_probe_groups, pg);
+
+               if (++pattern == ARRAY_SIZE(analog_pattern_str))
+                       pattern = 0;
        }
 
        sdi->priv = devc;
@@ -378,7 +379,7 @@ static int dev_close(struct sr_dev_inst *sdi)
 
 static int cleanup(void)
 {
-       return dev_clear();
+       return std_dev_clear(di, NULL);
 }
 
 static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
@@ -619,7 +620,7 @@ static int prepare_data(int fd, int revents, void *cb_data)
        struct sr_probe_group *pg;
        struct analog_gen *ag;
        GSList *l;
-       uint64_t samples_to_send, expected_samplenum, analog_samples, sending_now;
+       uint64_t logic_todo, analog_todo, expected_samplenum, analog_samples, sending_now;
        int64_t time, elapsed;
 
        (void)fd;
@@ -632,20 +633,15 @@ static int prepare_data(int fd, int revents, void *cb_data)
        time = g_get_monotonic_time();
        elapsed = time - devc->starttime;
        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;
-
-       if (devc->limit_samples) {
-               samples_to_send = MIN(samples_to_send,
-                               devc->limit_samples - devc->samples_counter);
-       }
 
-       while (samples_to_send > 0) {
-               sending_now = 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_probes > 0) {
-                       sending_now = MIN(samples_to_send,
+               if (devc->num_logic_probes > 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;
@@ -654,10 +650,12 @@ static int prepare_data(int fd, int revents, void *cb_data)
                        logic.unitsize = devc->logic_unitsize;
                        logic.data = devc->logic_data;
                        sr_session_send(sdi, &packet);
+                       logic_todo -= sending_now;
+                       devc->logic_counter += sending_now;
                }
 
                /* Analog, one probe at a time */
-               if (devc->num_analog_probes > 0) {
+               if (devc->num_analog_probes > 0 && analog_todo > 0) {
                        sending_now = 0;
                        for (l = devc->analog_probe_groups; l; l = l->next) {
                                pg = l->data;
@@ -670,21 +668,20 @@ static int prepare_data(int fd, int revents, void *cb_data)
                                 * beginning of our buffer. A ring buffer would
                                 * help here as well */
 
-                               analog_samples = MIN(samples_to_send, ag->num_samples);
+                               analog_samples = MIN(analog_todo, ag->num_samples);
                                /* Whichever probe 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;
                }
-
-               samples_to_send -= sending_now;
-               devc->samples_counter += sending_now;
        }
 
-       if (devc->limit_samples &&
-               devc->samples_counter >= devc->limit_samples) {
-               sr_info("Requested number of samples reached.");
+       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;
        }
@@ -700,9 +697,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
-       /* TODO: don't start without a sample limit set */
        devc = sdi->priv;
-       devc->samples_counter = 0;
+       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
@@ -772,7 +770,7 @@ SR_PRIV struct sr_dev_driver demo_driver_info = {
        .cleanup = cleanup,
        .scan = scan,
        .dev_list = dev_list,
-       .dev_clear = dev_clear,
+       .dev_clear = NULL,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,