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 f18b2786b4505bfccc65d21edefdba0eceb6822c..a3e85c341108a395dd12e642736c7a074c49ade3 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -166,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);
@@ -206,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 */
@@ -225,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--;
@@ -240,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--;
@@ -384,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,
@@ -640,13 +635,8 @@ static int prepare_data(int fd, int revents, void *cb_data)
        expected_samplenum = elapsed * devc->cur_samplerate / 1000000;
 
        /* Of those, how many do we still have to send? */
-       logic_todo = expected_samplenum - devc->logic_counter;
-       analog_todo = expected_samplenum - devc->analog_counter;
-
-       if (devc->limit_samples) {
-               logic_todo = MIN(logic_todo, devc->limit_samples - devc->logic_counter);
-               analog_todo = MIN(analog_todo, devc->limit_samples - devc->analog_counter);
-       }
+       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 */
@@ -689,8 +679,7 @@ static int prepare_data(int fd, int revents, void *cb_data)
                }
        }
 
-       if (devc->limit_samples &&
-                       devc->logic_counter >= devc->limit_samples &&
+       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);
@@ -708,8 +697,9 @@ 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;
+       if (devc->limit_samples == 0)
+               return SR_ERR;
        devc->logic_counter = devc->analog_counter = 0;
 
        /*
@@ -780,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,